##// END OF EJS Templates
mq: update bookmarks during qrefresh...
David Soria Parra -
r17730:6c698776 default
parent child Browse files
Show More
@@ -63,7 +63,7 b' from mercurial.i18n import _'
63 from mercurial.node import bin, hex, short, nullid, nullrev
63 from mercurial.node import bin, hex, short, nullid, nullrev
64 from mercurial.lock import release
64 from mercurial.lock import release
65 from mercurial import commands, cmdutil, hg, scmutil, util, revset
65 from mercurial import commands, cmdutil, hg, scmutil, util, revset
66 from mercurial import repair, extensions, url, error, phases
66 from mercurial import repair, extensions, url, error, phases, bookmarks
67 from mercurial import patch as patchmod
67 from mercurial import patch as patchmod
68 import os, re, errno, shutil
68 import os, re, errno, shutil
69
69
@@ -1577,6 +1577,7 b' class queue(object):'
1577 a = list(aa)
1577 a = list(aa)
1578 c = [filter(matchfn, l) for l in (m, a, r)]
1578 c = [filter(matchfn, l) for l in (m, a, r)]
1579 match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs))
1579 match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs))
1580 bmlist = repo[top].bookmarks()
1580
1581
1581 try:
1582 try:
1582 if diffopts.git or diffopts.upgrade:
1583 if diffopts.git or diffopts.upgrade:
@@ -1662,6 +1663,11 b' class queue(object):'
1662 for chunk in chunks:
1663 for chunk in chunks:
1663 patchf.write(chunk)
1664 patchf.write(chunk)
1664 patchf.close()
1665 patchf.close()
1666
1667 for bm in bmlist:
1668 repo._bookmarks[bm] = n
1669 bookmarks.write(repo)
1670
1665 self.applied.append(statusentry(n, patchfn))
1671 self.applied.append(statusentry(n, patchfn))
1666 except: # re-raises
1672 except: # re-raises
1667 ctx = repo[cparents[0]]
1673 ctx = repo[cparents[0]]
General Comments 0
You need to be logged in to leave comments. Login now