Sat, 11 Jun 2011 21:24:50 +0800 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:24:50 +0800] rev 14571
paper, coal: display diffstat on the changeset page Displayed in a row of the changeset summary table, underneath the list of files. When the page is loaded, only the diff summary is displayed. The full diffstat is only displayed when the [+] link is selected.
Sat, 11 Jun 2011 21:11:43 +0800 web: provide diff summary to the changeset page
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:11:43 +0800] rev 14570
web: provide diff summary to the changeset page This is the same message displayed at the end of the "diff --stat" command. For example, "9 files changed, 1651 insertions(+), 2 deletions(-)". The webutil.diffstatgen function allows the diffstat data to be lazily calculated only once and then re-used.
Sat, 11 Jun 2011 14:14:53 -0500 tests: fix up date ambiguity in cvs test
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:53 -0500] rev 14569
tests: fix up date ambiguity in cvs test
Sat, 11 Jun 2011 14:14:52 -0500 hg: split peer and repo lookup tables
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:52 -0500] rev 14568
hg: split peer and repo lookup tables
Sat, 11 Jun 2011 14:40:25 +0200 tests: rename test-git-import.t into test-import-git.t
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:40:25 +0200] rev 14567
tests: rename test-git-import.t into test-import-git.t This is consistent with other test-import* tests.
Sat, 11 Jun 2011 14:17:25 +0200 patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 14566
patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects.
Sat, 11 Jun 2011 14:14:13 +0200 patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:13 +0200] rev 14565
patch: stop updating changed files set in applydiff() This information is more correctly returned by backends. The extra updated file removed from test-mq-merge.t output came from changes from git patches being counted before being really applied in some cases.
Sat, 11 Jun 2011 14:14:11 +0200 patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:11 +0200] rev 14564
patch: turn patch() touched files dict into a set
Thu, 09 Jun 2011 01:19:39 +0800 paper, coal: define the diffstat templates
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:19:39 +0800] rev 14563
paper, coal: define the diffstat templates The templates output the filename, the total number of changes to the file and a bar graph of the adds and removes. The filename is a link into the diff output. The diffstat is not yet displayed, but it can be manually added to the changeset page template.
Thu, 09 Jun 2011 01:15:49 +0800 web: provide the file number to the diffstat templates
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:15:49 +0800] rev 14562
web: provide the file number to the diffstat templates This allows the diffstat templates to link into the diff output. For example, the URLs of the first three files within the diff are #l1.1, #l2.1, #l3.1.
Thu, 09 Jun 2011 01:14:22 +0800 web: include all files in the diffstat
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:14:22 +0800] rev 14561
web: include all files in the diffstat The webutil.diffstat function now returns a diffstat template for each file in the diff. It previously returned a template for each file returned by ctx.files() which did not work well for merge changesets.
Fri, 10 Jun 2011 20:38:02 +0200 hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 20:38:02 +0200] rev 14560
hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
Wed, 08 Jun 2011 21:25:18 +0800 bookmarks: recognize the current bookmark when the local encoding isn't UTF-8
LUO Zheng <xmuluo@gmail.com> [Wed, 08 Jun 2011 21:25:18 +0800] rev 14559
bookmarks: recognize the current bookmark when the local encoding isn't UTF-8 The current bookmark is stored in bookmark.current, supposingly in UTF-8. But the call to encoding.fromlocal() is missing, therefore Hg is not able to recognize the current bookmark in the case that bookmark uses characters of which the bit stream is different between local encoding and UTF-8. For example, the Chinese version of Windows cmd uses gbk(cp936), not UTF-8. Therefore I won't be able to make a Chinese bookmark current. By wrapping mark in a encoding.fromlocal() call, the problem is solved.
Thu, 09 Jun 2011 10:15:24 +1000 distutils: Create MANIFEST.in instead of MANIFEST in Makefile
Stephen Thorne <stephen@thorne.id.au> [Thu, 09 Jun 2011 10:15:24 +1000] rev 14558
distutils: Create MANIFEST.in instead of MANIFEST in Makefile When running 'python setup.py sdist' many files were omitted from the resulting tarball that are required for a complete build, including the .h file for the inotify extension due to a python2.7+ distutils bug. This would cause 'make dist' to fail to build a correct dist on python2.7 By building a MANIFEST.in that is the same as the old MANIFEST with 'include' at the start of each line will cause a correct MANIFEST to be built and used by distutils.
Thu, 09 Jun 2011 18:39:14 +0200 revert: is reverting file states, not just file contents
Adrian Buehlmann <adrian@cadifra.com> [Thu, 09 Jun 2011 18:39:14 +0200] rev 14557
revert: is reverting file states, not just file contents e.g. x bit is reverted as well Also makes this paragraph more consistent with the preceding one, which already uses the term "state" (not "content").
Fri, 10 Jun 2011 11:43:38 -0500 hg: change various repository() users to use peer() where appropriate
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14556
hg: change various repository() users to use peer() where appropriate This gets all the easy cases (peers that aren't also used as repositories).
Fri, 10 Jun 2011 11:43:38 -0500 hg: have peer() call _lookup directly
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14555
hg: have peer() call _lookup directly Note that this means that peers no longer call the extension repository setup hooks.
Fri, 10 Jun 2011 11:43:38 -0500 hg: add peer method
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14554
hg: add peer method
Wed, 08 Jun 2011 18:24:33 +0200 hg: add opts argument to clone for internal remoteui
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 08 Jun 2011 18:24:33 +0200] rev 14553
hg: add opts argument to clone for internal remoteui
Mon, 06 Jun 2011 21:18:35 +0200 hg: use capable instead of capabilities
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:18:35 +0200] rev 14552
hg: use capable instead of capabilities
Wed, 08 Jun 2011 13:44:41 -0500 fileset: basic pattern and boolean support
Matt Mackall <mpm@selenic.com> [Wed, 08 Jun 2011 13:44:41 -0500] rev 14551
fileset: basic pattern and boolean support debugfileset can now generate file lists for things like: "* and not hg*"
Fri, 10 Jun 2011 16:50:45 +0200 tests: fix updated monotone version requirement
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 16:50:45 +0200] rev 14550
tests: fix updated monotone version requirement 0969d91fad5c only updated the comment, not the actual check.
Tue, 07 Jun 2011 17:02:54 -0500 check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 17:02:54 -0500] rev 14549
check-code: catch misspellings of descendant This word is fairly common in Mercurial, and easy to misspell.
Tue, 07 Jun 2011 16:02:51 -0500 revert: drop obvious paragraph about filenames
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:02:51 -0500] rev 14548
revert: drop obvious paragraph about filenames
Tue, 07 Jun 2011 16:01:38 -0500 revert: actually add pointer to backout
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:01:38 -0500] rev 14547
revert: actually add pointer to backout
Tue, 07 Jun 2011 14:54:17 -0500 revert: replace mention of 'roll back' with pointer to 'backout'
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:54:17 -0500] rev 14546
revert: replace mention of 'roll back' with pointer to 'backout'
Tue, 07 Jun 2011 14:51:18 -0500 revert: simplify description of effect of -r
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:51:18 -0500] rev 14545
revert: simplify description of effect of -r
Tue, 07 Jun 2011 14:49:04 -0500 revert: rearrange the date help
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:49:04 -0500] rev 14544
revert: rearrange the date help
Tue, 07 Jun 2011 14:47:54 -0500 revert: remove some redundancy in basic description
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:47:54 -0500] rev 14543
revert: remove some redundancy in basic description
Tue, 07 Jun 2011 14:19:05 -0500 revert: drop requirement to use -r to revert with two parents
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:19:05 -0500] rev 14542
revert: drop requirement to use -r to revert with two parents This reduces documentation confusion between the need to: a) hg revert -a -r . (drop all changes from a merge) b) hg up -C . (drop the second parent entirely) Currently revert is one of two commands (the other being tag) that still complains about uncommitted merges, dating from its former use of a generic defaultrev function that aborted.
Tue, 07 Jun 2011 14:18:39 -0500 revert: simplify usage note
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:18:39 -0500] rev 14541
revert: simplify usage note This points people looking for other commands to the right place with a minimum of verbiage.
Mon, 06 Jun 2011 17:38:32 -0500 revert: rewrite help summary
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 17:38:32 -0500] rev 14540
revert: rewrite help summary New users have a tendency to mistake 'revert' as the command to use to check out old revisions. They also occasionally mistake revert for a generalized undo (compare rollback). This version intentionally aims to avoid mentioning 'earlier' and thus intentionally no longer alludes to the (secondary) -r behavior (which in fact is not actually limited to 'earlier'). Instead, we mention checkout state, to convey that we can restore things to the way they were when checked out.
Sat, 04 Jun 2011 20:19:30 +0900 extensions: make disabled()/disabledext() load prebuilt index if available
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:19:30 +0900] rev 14539
extensions: make disabled()/disabledext() load prebuilt index if available __index__ contains a dict of {name: desc} of all extensions.
Sat, 04 Jun 2011 20:11:10 +0900 setup: add command to generate index of extensions
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:11:10 +0900] rev 14538
setup: add command to generate index of extensions It generates prebuilt index of all extensions, which will be used by frozen exe when running 'hg help extensions'. Now py2exe invokes this command automatically.
Mon, 06 Jun 2011 21:02:48 +0200 sshrepo: fix addchangegroup's signature
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:02:48 +0200] rev 14537
sshrepo: fix addchangegroup's signature Make it mirror the usage found in localrepo.push. This should only affect pushes to pre-unbundle ssh servers.
Mon, 06 Jun 2011 15:17:40 -0500 subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 15:17:40 -0500] rev 14536
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) We shouldn't try to process subrepos if .hgsub isn't present and we should remove .hgsubstate if .hgsub is marked for removal.
Sun, 05 Jun 2011 22:26:01 +0200 patch: dot not ignore hunk of files marked as 'deleted'
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:26:01 +0200] rev 14535
patch: dot not ignore hunk of files marked as 'deleted' git 'deleted' flag was processed unconditionnally and the file removed even if the related hunk was not matching.
Sun, 05 Jun 2011 22:24:19 +0200 patch: fix patchmeta/hunk synchronization in iterhunks()
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:19 +0200] rev 14534
patch: fix patchmeta/hunk synchronization in iterhunks() Synchronizing on bfile does not work on file removal where bfile is /dev/null. We match items on afile or bfile instead. The incorrect code makes iterhunks() to emit patchmeta and hunks separately in some cases. This is currently hidden by applydiff() being too tolerant when processing patchmeta, and will be fixed later.
Sun, 05 Jun 2011 22:24:11 +0200 patch: remove unnecessary exists() call in selectfile()
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:11 +0200] rev 14533
patch: remove unnecessary exists() call in selectfile()
Sun, 05 Jun 2011 22:24:02 +0200 import: deprecate --base
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:02 +0200] rev 14532
import: deprecate --base This option was a convenient hack introduced in Mercurial early days which unfortunately survived until now.
Sun, 05 Jun 2011 13:27:06 +0200 patch: remove redundant islink() call
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 13:27:06 +0200] rev 14531
patch: remove redundant islink() call
Sat, 04 Jun 2011 20:01:01 +0900 extensions: update doc of enabled() and disabled() according to d5b525697ddb
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:01:01 +0900] rev 14530
extensions: update doc of enabled() and disabled() according to d5b525697ddb
Sat, 04 Jun 2011 15:56:48 +0200 localrepo: add savecommitmessage() to write last-message.txt
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:56:48 +0200] rev 14529
localrepo: add savecommitmessage() to write last-message.txt
Sat, 04 Jun 2011 15:20:49 +0200 memctx: simplify constructor
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:20:49 +0200] rev 14528
memctx: simplify constructor
Fri, 03 Jun 2011 15:08:08 -0500 scmutil: improve path calculation for install-relative RC files (issue2841)
Matt Mackall <mpm@selenic.com> [Fri, 03 Jun 2011 15:08:08 -0500] rev 14527
scmutil: improve path calculation for install-relative RC files (issue2841) This code was ugly and might do the wrong thing with symlinks.
Fri, 03 Jun 2011 13:10:22 +0200 prepush: show details about new remote heads with --verbose
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 13:10:22 +0200] rev 14526
prepush: show details about new remote heads with --verbose previously, this info was only shown with --debug Note that the new remote heads are only shown if the command aborts, that is, they are *not* shown if --force was specified. See also change 91cb08a9e7fb.
Fri, 03 Jun 2011 12:16:17 +0200 prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 12:16:17 +0200] rev 14525
prepush: print short hash of first new head in abort message and don't mention the branch if it's the default branch. OLD: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) NEW: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote head 1e108cc5548c! (you should pull and merge or use push -f to force) This helps to identify which local head is causing troubles. See also change 91cb08a9e7fb.
Fri, 03 Jun 2011 11:26:43 +0200 prepush: eliminate 'if branch'
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 11:26:43 +0200] rev 14524
prepush: eliminate 'if branch' branch is always set anyway No change in program behavior.
Fri, 03 Jun 2011 20:32:54 +0200 revlog: bail out earlier in group when we have no chunks
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:32:54 +0200] rev 14523
revlog: bail out earlier in group when we have no chunks
Fri, 03 Jun 2011 20:23:32 +0200 localrepo: simplify file bundling code and fix progress bug
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:23:32 +0200] rev 14522
localrepo: simplify file bundling code and fix progress bug Progress for files was off by one, and the code was rather hackish.
Fri, 03 Jun 2011 20:15:06 +0200 localrepo: use list comprehension instead of generators
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:15:06 +0200] rev 14521
localrepo: use list comprehension instead of generators The lists in question are iterated and kept in memory further down the code path anyway, and this simplifies things.
Fri, 03 Jun 2011 20:12:37 +0200 localrepo: add total to changeset progress in bundle/push
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:12:37 +0200] rev 14520
localrepo: add total to changeset progress in bundle/push
Fri, 03 Jun 2011 20:08:26 +0200 statichttprepo: use in-place difference for shorter line
Martin Geisler <mg@aragost.com> [Fri, 03 Jun 2011 20:08:26 +0200] rev 14519
statichttprepo: use in-place difference for shorter line
Thu, 02 Jun 2011 00:33:33 +0200 workingctx: eliminate remove function
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 00:33:33 +0200] rev 14518
workingctx: eliminate remove function Inlining it into it's last remaining call place in cmdutil.copy. Note that cmdutil.copy is called with the wlock already held, so no additional locking is needed to call util.unlinkpath. We do not need to wrap the util.unlinkpath call into a try block, because at that point we already know whether abssrc exists or not -- thanks to the preceding util.copyfile call. Adding a new local 'srcexists' in cmdutil.copy for that purpose.
Thu, 02 Jun 2011 19:43:17 +0200 test-copy2: add case for moving a missing file
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 19:43:17 +0200] rev 14517
test-copy2: add case for moving a missing file
Thu, 02 Jun 2011 00:43:34 +0300 color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14516
color: check if ui is already a subclass of colorui before wrapping it since it's possible to reuse the ui object (see 80c599eee3f3) between dispatch calls, the ui might have been wrapped already. we could probably move this test up a bit but leaving it here allows updates to take effect by extstyles() and configstyles().
Thu, 02 Jun 2011 00:43:34 +0300 util: add helper function isatty(fd) to check for tty-ness
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14515
util: add helper function isatty(fd) to check for tty-ness
Thu, 02 Jun 2011 18:52:31 +0800 web: prevent TypeError thrown when using the diffstat templates
Steven Brown <StevenGBrown@gmail.com> [Thu, 02 Jun 2011 18:52:31 +0800] rev 14514
web: prevent TypeError thrown when using the diffstat templates Remove the lambda used to wrap webutil.diffstat because: - functions passed to the templater must accept keyword arguments - webutil.diffstat is a generator, so already calculates the diffstat lazily This reverts the changes made to 1d3e2349304a after it was submitted to the mailing list but before it was queued.
Thu, 02 Jun 2011 11:27:40 -0500 fileset: fix long line
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:27:40 -0500] rev 14513
fileset: fix long line
Thu, 02 Jun 2011 11:17:02 -0500 COPYING: refresh with current address from fsf.org
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:17:02 -0500] rev 14512
COPYING: refresh with current address from fsf.org
Wed, 01 Jun 2011 19:12:18 -0500 filesets: introduce basic fileset expression parser
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 19:12:18 -0500] rev 14511
filesets: introduce basic fileset expression parser
Thu, 02 Jun 2011 00:43:34 +0300 dispatch: add repo to the request
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14510
dispatch: add repo to the request allows callers of dispatch.dispatch to pass in an initialized repo object to be used. -R/--repository overrides the request repo.
Wed, 01 Jun 2011 16:42:50 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:42:50 -0500] rev 14509
merge with stable
Wed, 01 Jun 2011 16:32:48 -0500 Added signature for changeset 733af5d9f6b2 stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:32:48 -0500] rev 14508
Added signature for changeset 733af5d9f6b2
(0) -10000 -3000 -1000 -300 -100 -64 +64 +100 +300 +1000 +3000 +10000 +30000 tip