# HG changeset patch # User Matt Mackall # Date 2012-03-12 22:05:42 # Node ID 17f179805297cfc26eb4766c65c8d14107567c0e # Parent db68ee3289b634dd33579273a2ddd60cdea4a2ea # Parent cf17e76be4dd823b81c642e262f8b470048612bf merge with stable diff --git a/contrib/win32/mercurial.ini b/contrib/win32/mercurial.ini --- a/contrib/win32/mercurial.ini +++ b/contrib/win32/mercurial.ini @@ -71,7 +71,7 @@ editor = notepad ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe ;cmd.vimdiff = gvim.exe -;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' +;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" [hgk] diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -33,7 +33,8 @@ you do not need to type :hg:`extdiff -p # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc - vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' + vimdiff = gvim -f "+next" \\ + "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" Tool arguments can include variables that are expanded at runtime:: diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -1043,8 +1043,7 @@ class queue(object): hg.clean(repo, urev) repo.dirstate.write() - for rev in revs: - repair.strip(self.ui, repo, rev, backup) + repair.strip(self.ui, repo, revs, backup) finally: release(lock, wlock) diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt --- a/mercurial/help/phases.txt +++ b/mercurial/help/phases.txt @@ -14,7 +14,7 @@ Each changeset in a repository is in one These phases are ordered (public < draft < secret) and no changeset can be in a lower phase than its ancestors. For instance, if a changeset is public, all its ancestors are also public. Lastly, -changeset phases only be changed towards the public phase. +changeset phases should only be changed towards the public phase. How are phases managed? ----------------------- diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -781,11 +781,12 @@ class localrepository(repo.repository): self.opener.write("journal.desc", "%d\n%s\n" % (len(self), desc)) - bkname = self.join('bookmarks') - if os.path.exists(bkname): - util.copyfile(bkname, self.join('journal.bookmarks')) - else: - self.opener.write('journal.bookmarks', '') + try: + bk = self.opener.read("bookmarks") + except IOError: + bk = "" + self.opener.write("journal.bookmarks", bk) + phasesname = self.sjoin('phaseroots') if os.path.exists(phasesname): util.copyfile(phasesname, self.sjoin('journal.phaseroots')) diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -54,10 +54,13 @@ def _collectbrokencsets(repo, files, str return s -def strip(ui, repo, node, backup="all"): +def strip(ui, repo, nodelist, backup="all"): cl = repo.changelog # TODO handle undo of merge sets - striprev = cl.rev(node) + if isinstance(nodelist, str): + nodelist = [nodelist] + striplist = [cl.rev(node) for node in nodelist] + striprev = min(striplist) keeppartialbundle = backup == 'strip' @@ -68,8 +71,10 @@ def strip(ui, repo, node, backup="all"): # the list of heads and bases of the set of interesting revisions. # (head = revision in the set that has no descendant in the set; # base = revision in the set that has no ancestor in the set) - tostrip = set(cl.descendants(striprev)) - tostrip.add(striprev) + tostrip = set(striplist) + for rev in striplist: + for desc in cl.descendants(rev): + tostrip.add(desc) files = _collectfiles(repo, striprev) saverevs = _collectbrokencsets(repo, files, striprev) @@ -88,6 +93,7 @@ def strip(ui, repo, node, backup="all"): descendants = set(cl.descendants(*saverevs)) saverevs.difference_update(descendants) savebases = [cl.node(r) for r in saverevs] + stripbases = [cl.node(r) for r in tostrip] bm = repo._bookmarks updatebm = [] @@ -99,7 +105,7 @@ def strip(ui, repo, node, backup="all"): # create a changegroup for all the branches we need to keep backupfile = None if backup == "all": - backupfile = _bundle(repo, [node], cl.heads(), node, 'backup') + backupfile = _bundle(repo, stripbases, cl.heads(), node, 'backup') repo.ui.status(_("saved backup bundle to %s\n") % backupfile) if saveheads or savebases: # do not compress partial bundle if we remove it from disk later diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -301,7 +301,8 @@ Extension module help vs command help: # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc - vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' + vimdiff = gvim -f "+next" \ + "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" Tool arguments can include variables that are expanded at runtime: diff --git a/tests/test-mq-strip.t b/tests/test-mq-strip.t --- a/tests/test-mq-strip.t +++ b/tests/test-mq-strip.t @@ -311,7 +311,6 @@ 2 different branches: 2 strips $ hg strip 2 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) - saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) $ hg glog @ changeset: 2:65bd5f99a4a3 | tag: tip @@ -421,3 +420,13 @@ Verify strip protects against stripping $ hg status M bar ? b + $ cd .. + +stripping many nodes on a complex graph (issue3299) + + $ hg init issue3299 + $ cd issue3299 + $ hg debugbuilddag '@a.:a@b.:b.:x