Fri, 25 Mar 2016 21:51:00 +0000 ui: add prompt argument to write (issue5154) (API)
timeless <timeless@mozdev.org> [Fri, 25 Mar 2016 21:51:00 +0000] rev 28633
ui: add prompt argument to write (issue5154) (API) When code like filemerge._iprompt calls ui.prompt, it expects the user to see the output in addition to getting the prompt. Other code such as histedit may call ui.pushbuffer, but its goal is not to interfere with prompts, so this commit adds an optional prompt flag to ui.write and has _readline include that argument. ui.promptchoice calls ui.prompt which calls ui._readline. This commit also updates hgext.color.write.
Fri, 25 Mar 2016 10:47:49 -0700 hg: perform update after pulling during clone with share (issue5103) stable
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 25 Mar 2016 10:47:49 -0700] rev 28632
hg: perform update after pulling during clone with share (issue5103) This is a graft of 60adda1a0188 and a4692267bc2d from the default branch. Combined, they address a bug with pooled shared storage where an update may not update to the most recent revision when performing a `hg clone`. The patches should have been written against the stable branch in the beginning. I screwed up.
Sat, 26 Mar 2016 10:53:31 +0900 tests: fix failure of test-convert-mtn.t
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 26 Mar 2016 10:53:31 +0900] rev 28631
tests: fix failure of test-convert-mtn.t This is follow up for 3f9e25a42e69, which overlooked this test.
Sat, 26 Mar 2016 18:12:12 +0900 templater: relax unquotestring() to fall back to bare string
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Mar 2016 18:12:12 +0900] rev 28630
templater: relax unquotestring() to fall back to bare string This is convenient for our use case where quotes are optional except in a map file.
Sat, 26 Mar 2016 19:01:12 +0900 debugrevspec: show expanded/concatenated states before printing trees
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Mar 2016 19:01:12 +0900] rev 28629
debugrevspec: show expanded/concatenated states before printing trees The debugrevspec command prints at most 4 parsed trees. It wasn't easy to tell which tree belongs to which state.
Sat, 26 Mar 2016 18:01:04 +0900 templater: do not abuse SyntaxError to report errors in template map file
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Mar 2016 18:01:04 +0900] rev 28628
templater: do not abuse SyntaxError to report errors in template map file SyntaxError is the class representing syntax errors in Python code. We should use a dedicated exception class for our needs. With this change, unnecessary re-wrapping of SyntaxError can be eliminated.
Wed, 23 Mar 2016 13:34:47 -0700 graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com> [Wed, 23 Mar 2016 13:34:47 -0700] rev 28627
graphmod: set default edge styles for ascii graphs (BC) Leaving regular parent edges set to |, grandparent edges set to : and missing parent edges set to end early. A sample graph: o changeset: 32:d06dffa21a31 |\ parent: 27:886ed638191b | : parent: 31:621d83e11f67 | : o : changeset: 31:621d83e11f67 |\: parent: 21:d42a756af44d | : parent: 30:6e11cd4b648f | : o : changeset: 30:6e11cd4b648f |\ \ parent: 28:44ecd0b9ae99 | ~ : parent: 29:cd9bb2be7593 | / o : changeset: 28:44ecd0b9ae99 |\ \ parent: 1:6db2ef61d156 | ~ : parent: 26:7f25b6c2f0b9 | / o : changeset: 26:7f25b6c2f0b9 |\ \ parent: 18:1aa84d96232a | | : parent: 25:91da8ed57247 | | : | o : changeset: 25:91da8ed57247 | |\: parent: 21:d42a756af44d | | : parent: 24:a9c19a3d96b7 | | : | o : changeset: 24:a9c19a3d96b7 | |\ \ parent: 0:e6eb3150255d | | ~ : parent: 23:a01cddf0766d | | / | o : changeset: 23:a01cddf0766d | |\ \ parent: 1:6db2ef61d156 | | ~ : parent: 22:e0d9cccacb5d | | / | o : changeset: 22:e0d9cccacb5d |/:/ parent: 18:1aa84d96232a | : parent: 21:d42a756af44d | : | o changeset: 21:d42a756af44d | |\ parent: 19:31ddc2c1573b | | | parent: 20:d30ed6450e32 | | | +---o changeset: 20:d30ed6450e32 | | | parent: 0:e6eb3150255d | | ~ parent: 18:1aa84d96232a | | | o changeset: 19:31ddc2c1573b | |\ parent: 15:1dda3f72782d | ~ ~ parent: 17:44765d7c06e0 | o changeset: 18:1aa84d96232a parent: 1:6db2ef61d156 parent: 15:1dda3f72782d
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 tip