timeless <timeless@mozdev.org> [Mon, 28 Dec 2015 16:01:31 +0000] rev 27567
run-tests: avoid double counting server fails
Yuya Nishihara <yuya@tcha.org> [Mon, 14 Dec 2015 23:50:02 +0900] rev 27566
commandserver: reset state of progress bar per command
A progress bar is normally disabled in command-server session, but chg can
enable it. This patch makes sure the last-print time is measured per command.
Otherwise, progress.delay could be ineffective if a progbar was loaded before
forking worker process.
This patch is corresponding to the following change.
https://bitbucket.org/yuja/chg/commits/
2dfe3e90b365
Yuya Nishihara <yuya@tcha.org> [Mon, 14 Dec 2015 23:13:42 +0900] rev 27565
commandserver: do not set nontty flag if channel is replaced by a real file
This prepares for porting the chg server. In chg, a server receives client's
stdio over a UNIX domain socket to override server channels. This is because
chg should behave as if it is a normal hg command attached to tty. "nontty"
is not wanted.
This patch is corresponding to the following change. This doesn't test the
identity of "cin" object because the current version of chg reopens stdio
to apply buffering mode.
https://bitbucket.org/yuja/chg/commits/
c48c7aed5fc0
timeless <timeless@mozdev.org> [Tue, 22 Dec 2015 08:00:03 +0000] rev 27564
run-tests: report missing feature for skipped tests
Yuya Nishihara <yuya@tcha.org> [Sat, 26 Dec 2015 16:06:12 +0900] rev 27563
paths: do not process default-push as pushurl of default path (
issue5000)
It didn't work because "default-push" and "default" are independent named
items. Without this patch, "hg push default" would push to "default-push"
because paths["default"].pushloc was overwritten by "default-push".
Also, we shouldn't ban a user from doing "hg push default-push" so long as
"default-push" item is defined, not "default:pushurl". Otherwise, he would
be confused by missing "default-push" path.
Tests are included in a patch for stable branch.
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".
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.
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
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.
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.
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.
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.
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.
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]
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
timeless <timeless@mozdev.org> [Tue, 29 Dec 2015 15:02:13 +0000] rev 27552
help: remove stray double spaces from config help
timeless <timeless@mozdev.org> [Tue, 29 Dec 2015 15:00:04 +0000] rev 27551
help: clarify that the config hook priority prefix includes a period
Anton Shestakov <av6@dwimlabs.net> [Tue, 29 Dec 2015 01:40:34 +0800] rev 27550
monoblue: correct feed links on /branches, /tags and /bookmarks
Anton Shestakov <av6@dwimlabs.net> [Tue, 29 Dec 2015 18:17:29 +0800] rev 27549
gitweb: describe feed type in links on /branches, /tags and /bookmarks
Anton Shestakov <av6@dwimlabs.net> [Tue, 29 Dec 2015 18:16:09 +0800] rev 27548
gitweb: link to the correct feeds from help pages
timeless <timeless@mozdev.org> [Wed, 23 Dec 2015 23:51:29 +0000] rev 27547
histedit: handle exceptions from node.bin in fromrule
timeless <timeless@mozdev.org> [Wed, 23 Dec 2015 23:23:28 +0000] rev 27546
histedit: limit cleanup of histedit-last-edit.txt to success
timeless <timeless@mozdev.org> [Sun, 27 Dec 2015 03:33:09 +0000] rev 27545
histedit: use parse-error exception for parsing
timeless <timeless@mozdev.org> [Fri, 11 Dec 2015 07:08:36 +0000] rev 27544
test-histedit-edit: test histedit with dirty repo
timeless <timeless@mozdev.org> [Fri, 11 Dec 2015 07:08:09 +0000] rev 27543
histedit: limit mentioning histedit-last-edit.txt
Before histedit-last-edit.txt would be mentioned for any failure.
After, it should only be mentioned for failures relating to user
input.
timeless <timeless@mozdev.org> [Mon, 28 Dec 2015 22:53:22 +0000] rev 27542
histedit: check fold of public change during verify
timeless <timeless@mozdev.org> [Mon, 28 Dec 2015 22:52:48 +0000] rev 27541
histedit: pass previous action to verify
timeless <timeless@mozdev.org> [Thu, 17 Dec 2015 14:56:14 +0000] rev 27540
annotate: mention that -n is suppressed in help