Mercurial > public > mercurial-scm > hg-stable
diff mercurial/exchange.py @ 23081:e62c330a044f stable
bookmarks: explicitly track identical bookmarks
bookmarks.compare() previously lumped identical bookmarks in the
"invalid" bucket. This patch adds a "same" bucket.
An 8-tuple for holding this state is pretty gnarly. The return value
should probably be converted into a class to increase readability. But
that is beyond the scope of a patch intended to be a late arrival to
stable.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 24 Oct 2014 10:40:37 -0700 |
| parents | f10019d2ee0a |
| children | 0fc4686de1d7 |
line wrap: on
line diff
--- a/mercurial/exchange.py Fri Oct 24 15:52:20 2014 -0500 +++ b/mercurial/exchange.py Fri Oct 24 10:40:37 2014 -0700 @@ -333,7 +333,7 @@ explicit = set(pushop.bookmarks) comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) - addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp + addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp for b, scid, dcid in advsrc: if b in explicit: explicit.remove(b)