Sat, 26 Dec 2015 16:12:28 +0900 push: specify default-push and default as fallback paths
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Dec 2015 16:12:28 +0900] rev 27562
push: specify default-push and default as fallback paths The next patch will remove the "default-push" hack from ui.paths so that ui.paths["default"].pushurl can be different from "default-push".
Sat, 26 Dec 2015 16:10:39 +0900 paths: make getpath() accept multiple defaults
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Dec 2015 16:10:39 +0900] rev 27561
paths: make getpath() accept multiple defaults This is necessary to handle "default-push" and "default" as fallback items. We can't apply the same rule as "default:pushurl" because "default-push" is a valid named path. This series is for default branch. I have a simpler patch for stable.
Thu, 24 Dec 2015 19:32:14 +0000 check-code: improve test-check-code error diffs
timeless <timeless@mozdev.org> [Thu, 24 Dec 2015 19:32:14 +0000] rev 27560
check-code: improve test-check-code error diffs Whenever check-code finds something wrong, the diffs it generated were fairly hard to read. The problem is that check-code before this change would list files that were white listed using no- check- code but without a glob marker. Whereas, the test-check-code.t expected output has no-che?k-code (glob) in order to avoid having itself flagged as a file to skip. Thus, in addition to any lines relating to things you did wrong, all of the white-listed files are listed as changed. There is no reason for things to be this painful. This change makes the output from check-code.py match the expected output in test-check-code.t
Thu, 24 Dec 2015 10:16:30 -0800 destutil: use scmutil.revrange for desthistedit (issue5001)
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 24 Dec 2015 10:16:30 -0800] rev 27559
destutil: use scmutil.revrange for desthistedit (issue5001) This allows user aliases to be expanded. It also prevents the user-provided revset from being treated as a revset expression.
Fri, 18 Dec 2015 13:53:50 -0600 pull: make a single call to obsstore.add (issue5006)
Matt Mackall <mpm@selenic.com> [Fri, 18 Dec 2015 13:53:50 -0600] rev 27558
pull: make a single call to obsstore.add (issue5006) Prior to this, a pull of 90k markers (already known locally!) was making about 2000 calls to obsstore.add, which was repeatedly building a full set of known markers (in addition to other transaction overhead). This quadratic behavior accounted for about 50 seconds of a 70 second no-op pull. After this change, we're down to 20 seconds. While it would seem simplest to just cache the known set for obsstore.add, this would also introduce issues of correct cache invalidation. The extra pointless transaction overhead would also remain.
Sun, 27 Dec 2015 15:24:48 -0800 tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com> [Sun, 27 Dec 2015 15:24:48 -0800] rev 27557
tests: Solaris diff -U also emits "No differences encountered" This came up before, but the tests in check-code.py don't find -U (only -u) and they don't work when the diff is inside a shell function. This fixes the offending tests and beefs up check-code.py.
Tue, 29 Dec 2015 18:11:14 -0500 test-glog: avoid check-code violation after next patch
Augie Fackler <raf@durin42.com> [Tue, 29 Dec 2015 18:11:14 -0500] rev 27556
test-glog: avoid check-code violation after next patch Danek's patch will help us avoid spurious test breakages on Solaris. This test wasn't broken on Solaris because of the grep(1) use, but it will upset check-code. Use cmp to silence check-code since it doesn't matter.
Sat, 26 Dec 2015 15:18:16 +0900 push: restore old behavior of default-push (issue5000) stable
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Dec 2015 15:18:16 +0900] rev 27555
push: restore old behavior of default-push (issue5000) This effectively backs out dceaef70e410 and 10917b062adf. We can't handle "default-push" just like "default:pushurl" because it is a stand-alone named path. Instead, I have two ideas to work around the issue: a. two defaults: getpath(dest, default=('default-push', 'default')) b. virtual path: getpath(dest, default=':default') (a) is conservative approach and will have less trouble, but callers have to specify they need "default-push" or "default". (b) generates hidden ":default" path from "default" and "default-push", and callers request ":default". This will require some tricks and won't work if there are conflicting sub-options valid for both "pull" and "push". I'll take (a) for default branch. This patch should NOT BE MERGED to default except for tests because it would break handling of "pushurl" sub-option.
Tue, 29 Dec 2015 00:48:03 +0900 hgweb: fixed invalid atom-log feed url in file log page
Yoshinari Takaoka <mumumu@mumumu.org> [Tue, 29 Dec 2015 00:48:03 +0900] rev 27554
hgweb: fixed invalid atom-log feed url in file log page currently "subscribe to atom feed" link in file log page is as follows. /atom-log/[revision]/[file] This is invalid, because we could not get newer commit feed than [revision]. To fix this, atom-log feed url should be the following style. atom-log/tip/[file]
Tue, 29 Dec 2015 10:21:39 -0800 repair: improves documentation of strip regarding locks
Laurent Charignon <lcharignon@fb.com> [Tue, 29 Dec 2015 10:21:39 -0800] rev 27553
repair: improves documentation of strip regarding locks This patch adds a comment making it clear that we should hold a lock before calling repair.strip. The wording is the same than what we have for obsolete.createmarkers
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip