Patchwork [accept-scripts] land: fix bug we see when we merge, rather than rebase

login
register
mail settings
Submitter Kevin Bullock
Date April 27, 2018, 3:30 p.m.
Message ID <4894FD32-96F4-401F-AC98-5EF0192F641B@ringworld.org>
Download mbox | patch
Permalink /patch/31242/
State Accepted
Headers show

Comments

Patch

--- /Users/kbullock/Source/Projects/hg/accept/tests/test-land.t
+++ /Users/kbullock/Source/Projects/hg/accept/tests/test-land.t.err
@@ -23,15 +23,8 @@ 
 More complicated example built using debugbuilddag. This emulates a bug
 encountered during the hg 4.6 freeze.
   >>> import os
-  >>> with open(os.environ['HG_ACCEPT_CONFIG']) as f:
-  ...   cfg = f.read()
-  >>> cfglines = cfg.splitlines()
-  >>> cfglines[-2] = cfglines[-2][:-len('source')] + 'complexsrc'
-  >>> cfglines[-1] = cfglines[-1][:-len('target')] + 'complextgt'
-  >>> with open(os.environ['HG_ACCEPT_CONFIG'], 'w') as f:
-  ...   f.write('\n'.join(cfglines))
-
-  $ hg init complexsrc
+  /usr/bin/python: No module named heredoctest
+  [1]
   $ hg init complextgt
   $ cd complexsrc
   $ hg debugbuilddag '. @stable +2 :pubhead <2 +2 :daggyfix /3 +1 :accepted +3'
@@ -81,20 +74,26 @@ 

 We expect to get the hash of 7 as blocker
   $ blocker
-  38e0ccfa60f109f813eba32713eada1543664dbf alice
+  ff05b7beb4519606efcf1cf8ccf7964280e566e9 alice
 We expect to land 3::6.
   $ land
+  hg: parse error: empty query
+  Traceback (most recent call last):
+    File "/Users/kbullock/Source/Projects/hg/accept/tests/../land", line 50, in <module>
+      conf.source, ' + '.join(all_accepted))))
+    File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 290, in load
+      **kw)
+    File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 338, in loads
+      return _default_decoder.decode(s)
+    File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 366, in decode
+      obj, end = self.raw_decode(s, idx=_w(s, 0).end())
+    File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 384, in raw_decode
+      raise ValueError("No JSON object could be decoded")
+  ValueError: No JSON object could be decoded
+  [1]
   $ hg log -G -T'{rev}:{node|shortest} {branch} {tags}\n'
-  o  6:ee2d stable tip
+  o  2:f3cf stable tip
   |
-  o    5:4721 stable
-  |\
-  | o  4:6cfb stable
-  | |
-  | o  3:0ccc stable
-  | |
-  o |  2:f3cf stable
-  |/
   o  1:a079 stable
   |
   o  0:1ea7 default