Mercurial > hg-stable
changeset 20533:87e52e642562
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 19 Feb 2014 16:46:47 -0600 |
| parents | f1a3ae7c15df (current diff) 78f547cdc362 (diff) |
| children | 4849f574aa24 |
| files | |
| diffstat | 5 files changed, 32 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Feb 19 13:25:28 2014 +0100 +++ b/hgext/rebase.py Wed Feb 19 16:46:47 2014 -0600 @@ -404,6 +404,9 @@ if currentbookmarks: updatebookmarks(repo, targetnode, nstate, currentbookmarks) + if activebookmark not in repo._bookmarks: + # active bookmark was divergent one and has been deleted + activebookmark = None clearstatus(repo) ui.note(_("rebase completed\n"))
--- a/mercurial/hgweb/server.py Wed Feb 19 13:25:28 2014 +0100 +++ b/mercurial/hgweb/server.py Wed Feb 19 16:46:47 2014 -0600 @@ -331,6 +331,7 @@ # as ascii (clown fail), because the default Python Unicode # codec is hardcoded as ascii. + sys.argv # unwrap demand-loader so that reload() works reload(sys) # resurrect sys.setdefaultencoding() oldenc = sys.getdefaultencoding() sys.setdefaultencoding("latin1") # or any full 8-bit encoding
--- a/mercurial/verify.py Wed Feb 19 13:25:28 2014 +0100 +++ b/mercurial/verify.py Wed Feb 19 16:46:47 2014 -0600 @@ -38,7 +38,7 @@ mf = repo.manifest lrugetctx = util.lrucachefunc(repo.changectx) - if not repo.cancopy(): + if not repo.url().startswith('file:'): raise util.Abort(_("cannot verify bundle or remote repos")) def err(linkrev, msg, filename=None):
--- a/tests/test-phases.t Wed Feb 19 13:25:28 2014 +0100 +++ b/tests/test-phases.t Wed Feb 19 16:46:47 2014 -0600 @@ -549,4 +549,13 @@ o 0 public A +test verify repo containing hidden changesets, which should not abort just +because repo.cancopy() is False + $ cd ../initialrepo + $ hg verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 7 files, 8 changesets, 7 total revisions
--- a/tests/test-rebase-bookmarks.t Wed Feb 19 13:25:28 2014 +0100 +++ b/tests/test-rebase-bookmarks.t Wed Feb 19 16:46:47 2014 -0600 @@ -85,6 +85,24 @@ |/ o 0: 'A' bookmarks: Y@diverge +Do not try to keep active but deleted divergent bookmark + + $ cd .. + $ hg clone -q a a4 + + $ cd a4 + $ hg up -q 2 + $ hg book W@diverge + + $ hg rebase -s W -d . + saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) + + $ hg bookmarks + W 3:0d3554f74897 + X 1:6c81ed0049f8 + Y 2:49cb3485fa0c + Z 2:49cb3485fa0c + Keep bookmarks to the correct rebased changeset $ cd ..