Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Thu, 06 May 2010 15:14:40 -0300] rev 11115
acl: update docstring to describe section [acl.groups]
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Thu, 06 May 2010 14:23:14 -0300] rev 11114
acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups
Matt Mackall <mpm@selenic.com> [Fri, 07 May 2010 14:14:41 -0500] rev 11113
subrepo: fix test output
Edouard Gomez <ed.gomez@free.fr> [Sat, 01 May 2010 23:05:22 +0200] rev 11112
subrepo: print paths relative to upper repo root for push/pull/commit
This makes more sense when using multiple levels of
nesting.
This happens to help a lot in a case where 3 projects
of mine all use the same makefile helper project as a
sub. A fourth project use these first three projects
and current output made it very hard to figure
which makefile helper was committed. it looked more
like the project was committed/pushed/pulled three times
in a row than dealing on three different repos.
Edouard Gomez <ed.gomez@free.fr> [Sat, 01 May 2010 23:05:22 +0200] rev 11111
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr> [Sat, 01 May 2010 23:05:21 +0200] rev 11110
subrepo: dirtiness checks should iterate over subrepos
Edouard Gomez <ed.gomez@free.fr> [Sat, 01 May 2010 23:05:19 +0200] rev 11109
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
For a "all projects at root" repo layout eg:
/main
/sub
Where subrepos are used such that a clone of main has this layout:
./main/
./main/.hgsub
./main/sub/
And the .hgsub content is:
sub = ../sub
This allows a pull from a hgweb where main and sub are exposed
at the root (or same directory level)
The current code doesn't normalize the path component of a pull
url. this results in trying to pull from
http://server.com/hg/main/../sub
Current hgweb implementation doesn't reduce the path component
so this results in a 404 error though everything is setup logically.
This patch adresses this 404 error on the puller side
normalizing the URLs used for pulling sub repos. For this
example, the URL would be reduced to http://server.com/hg/sub
Fix + test
Matt Mackall <mpm@selenic.com> [Fri, 07 May 2010 14:14:41 -0500] rev 11108
mq: fix test
Matt Mackall <mpm@selenic.com> [Wed, 05 May 2010 20:53:45 -0500] rev 11107
mq: add a line to hg summary
Steve Borho <steve@borho.org> [Fri, 07 May 2010 14:07:30 -0500] rev 11106
changectx: change diff() to accept keyword opts
Steve Borho <steve@borho.org> [Fri, 07 May 2010 10:59:11 -0500] rev 11105
changectx: use repo.ui diffopts, allow argument override
Martin Geisler <mg@lazybytes.net> [Fri, 07 May 2010 17:03:48 +0200] rev 11104
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 07 May 2010 17:03:31 +0200] rev 11103
commands: explain that "hg serve" does not do authentication
Martin Geisler <mg@lazybytes.net> [Fri, 07 May 2010 17:01:14 +0200] rev 11102
commands: explain that "hg serve" is mostly for ad-hoc sharing
Matt Mackall <mpm@selenic.com> [Wed, 05 May 2010 20:21:57 -0500] rev 11101
context: only scan unknowns when needed
Matt Mackall <mpm@selenic.com> [Tue, 04 May 2010 15:52:42 -0500] rev 11100
context: use asserts for ignored and clean exceptions
Steve Borho <steve@borho.org> [Tue, 04 May 2010 15:02:55 -0500] rev 11099
workingctx: use member variables to store ignored and clean
If some code tries to query ignored or clean files without first
calling the explicit status() method to query them, it will raise
an exception (indicating a software bug).
Steve Borho <steve@borho.org> [Tue, 04 May 2010 14:52:25 -0500] rev 11098
workingctx: add explicit status method, add ignored and fix clean
workingctx.clean() and memctx.clean() have both been returning ignored files
since their creation. This patch fixes clean() while introducing a method for
querying ignored files. The new status() method can be used to explicitly
override the default (fast) arguments used by the _status property.
Steve Borho <steve@borho.org> [Tue, 04 May 2010 20:12:58 -0500] rev 11097
context: add a changectx.diff() convenience function
With this function, extracting diffs becomes trivial:
repo = hg.repository(ui.ui(), path=root)
ctx = repo['tip']
for out in ctx.diff(): print out
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 14:02:45 +0200] rev 11096
keyword: omit setting extra variable for record context
Since dc2f37864348 the context is always retrieved in
kwtemplater.overwrite().
Martin Geisler <mg@aragost.com> [Wed, 05 May 2010 09:25:09 +0200] rev 11095
acl: more consistent docstring
Martin Geisler <mg@aragost.com> [Wed, 05 May 2010 09:18:05 +0200] rev 11094
acl: fix reST syntax
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 04 May 2010 08:39:11 -0300] rev 11093
acl: update test output for branch-based access control
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 04 May 2010 08:37:20 -0300] rev 11092
acl: add support for branch-based access control
Brendan Cully <brendan@kublai.com> [Mon, 03 May 2010 15:28:04 -0700] rev 11091
Merge with main
Brendan Cully <brendan@kublai.com> [Mon, 03 May 2010 15:27:05 -0700] rev 11090
Merge with stable
Brendan Cully <brendan@kublai.com> [Mon, 03 May 2010 15:22:47 -0700] rev 11089
grep: clarify help for -r
Matt Mackall <mpm@selenic.com> [Mon, 03 May 2010 17:05:23 -0500] rev 11088
summary: add subrepo status
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:59:39 +0200] rev 11087
keyword: simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
duplicating the dictionary lookup repo['.'] as negligible
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 May 2010 09:15:17 +0200] rev 11086
Adjusted output of test-subrepo for issue1977 to 05856e682521
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 02 May 2010 00:48:33 +0200] rev 11085
fix coding style
Steve Borho <steve@borho.org> [Sat, 01 May 2010 16:57:02 -0500] rev 11084
color: fix typo in w32effect for bold_background
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:03:45 -0500] rev 11083
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:02:51 -0500] rev 11082
Added signature for changeset 39f725929f0c
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:02:51 -0500] rev 11081
Added tag 1.5.2 for changeset 39f725929f0c
Wagner Bruna <wbruna@yahoo.com> [Sat, 01 May 2010 17:56:54 -0300] rev 11080
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 01 May 2010 17:55:44 -0300] rev 11079
i18n-pt_BR: synchronized with ee5b112aa529
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:15:35 -0500] rev 11078
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:14:22 -0500] rev 11077
Merge with i18n
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:08:30 -0500] rev 11076
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 17:41:09 -0300] rev 11075
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 17:39:56 -0300] rev 11074
i18n-pt_BR: synchronized with 3b89899934a6
Faheem Mitha <faheem@email.unc.edu> [Sat, 01 May 2010 23:04:49 +0530] rev 11073
mq: rewrite strip docstrings
This patch is joint work with ilowe.
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:51 +0200] rev 11072
test-issue2137: don't use $PWD; use `pwd` instead
This fixes test failure on Solaris, as described on
http://mercurial.selenic.com/wiki/WritingTests
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:49 +0200] rev 11071
test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:46 +0200] rev 11070
test-extension: changed environment variables must be exported again
This fixes failure on Solaris because HGRCPATH wasn't unset.
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 19:50:37 -0300] rev 11069
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 19:49:35 -0300] rev 11068
subrepo: update test output for issue1977 fix
Matt Mackall <mpm@selenic.com> [Fri, 30 Apr 2010 18:32:18 -0500] rev 11067
subrepo: propagate and catch push failures
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 26 Apr 2010 20:13:14 +0900] rev 11066
static-http: mimic more closely localrepo (issue2164: allow clone -r )
* httprangereader: name, __iter__ and close are needed to mimic file object
* static-http opener:
- disallow write/append modes
- add (unused) atomictemp parameter
* static-http repo:
- root attribute is needed for localrepo.dirstate()
- _branch* attributes are required for commitctx and branchmap calls
* tags: force repo.opener.__iter__ call earlier to force httprangereader
to try to read the cache early, to avoid raising IOError later.
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 11065
keyword: cleanup test and make it portable
- replace sed call with python command
- no need to back up hgrc before record
Mads Kiilerich <mads@kiilerich.com> [Fri, 30 Apr 2010 15:05:51 +0200] rev 11064
mq: qpush --move, reorder patch series and apply only the patch
This makes it less necessary to edit .hg/patches/series manually.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 19 Apr 2010 17:41:12 +0900] rev 11063
tag: warn users about tag/branch possible name conflicts
As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision
Mads Kiilerich <mads@kiilerich.com> [Mon, 19 Apr 2010 11:31:19 +0200] rev 11062
contrib/mercurial.spec: Use DESTDIR variable and 'make install'
Yuya Nishihara <yuya@tcha.org> [Thu, 01 Apr 2010 00:35:12 +0900] rev 11061
log: add --stat for diffstat output
log --stat shows diffstat in place of patch output.
David Greenaway <hg-dev@davidgreenaway.com> [Sat, 03 Apr 2010 11:58:16 +1100] rev 11060
findrenames: Optimise "addremove -s100" by matching files by their SHA1 hashes.
We speed up 'findrenames' for the usecase when a user specifies they
want a similarity of 100% by matching files by their exact SHA1 hash
value. This reduces the number of comparisons required to find exact
matches from O(n^2) to O(n).
While it would be nice if we could just use mercurial's pre-calculated
SHA1 hash for existing files, this hash includes the file's ancestor
information making it unsuitable for our purposes. Instead, we calculate
the hash of old content from scratch.
The following benchmarks were taken on the current head of crew:
addremove 100% similarity:
rm -rf *; hg up -C; mv tests tests.new
hg --time addremove -s100 --dry-run
before: real 176.350 secs (user 128.890+0.000 sys 47.430+0.000)
after: real 2.130 secs (user 1.890+0.000 sys 0.240+0.000)
addremove 75% similarity:
rm -rf *; hg up -C; mv tests tests.new; \
for i in tests.new/*; do echo x >> $i; done
hg --time addremove -s75 --dry-run
before: real 264.560 secs (user 215.130+0.000 sys 49.410+0.000)
after: real 218.710 secs (user 172.790+0.000 sys 45.870+0.000)