# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1393289328 21600
# Node ID 35ac807f941c514470de2c2708a5886f8b61f089
# Parent  5f683209f5b6f012919a7c5e3bb37f8829146652# Parent  708009db94100e12341fba7aec8b92c41860bb67
merge with i18n

diff -r 708009db9410 -r 35ac807f941c hgext/rebase.py
--- a/hgext/rebase.py	Sun Feb 23 18:03:47 2014 +0900
+++ b/hgext/rebase.py	Mon Feb 24 18:48:48 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"))
diff -r 708009db9410 -r 35ac807f941c mercurial/hgweb/server.py
--- a/mercurial/hgweb/server.py	Sun Feb 23 18:03:47 2014 +0900
+++ b/mercurial/hgweb/server.py	Mon Feb 24 18:48:48 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
diff -r 708009db9410 -r 35ac807f941c mercurial/pathencode.c
--- a/mercurial/pathencode.c	Sun Feb 23 18:03:47 2014 +0900
+++ b/mercurial/pathencode.c	Mon Feb 24 18:48:48 2014 -0600
@@ -530,7 +530,7 @@
 	static const uint32_t twobytes[8];
 
 	static const uint32_t onebyte[8] = {
-		~0, 0xffff3ffe, ~0, ~0, ~0, ~0, ~0, ~0,
+		~0U, 0xffff3ffe, ~0U, ~0U, ~0U, ~0U, ~0U, ~0U,
 	};
 
 	return _encode(twobytes, onebyte, dest, 0, destsize, src, len, 0);
diff -r 708009db9410 -r 35ac807f941c mercurial/verify.py
--- a/mercurial/verify.py	Sun Feb 23 18:03:47 2014 +0900
+++ b/mercurial/verify.py	Mon Feb 24 18:48:48 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):
diff -r 708009db9410 -r 35ac807f941c tests/test-phases.t
--- a/tests/test-phases.t	Sun Feb 23 18:03:47 2014 +0900
+++ b/tests/test-phases.t	Mon Feb 24 18:48:48 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
diff -r 708009db9410 -r 35ac807f941c tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t	Sun Feb 23 18:03:47 2014 +0900
+++ b/tests/test-rebase-bookmarks.t	Mon Feb 24 18:48:48 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 ..