Sun, 01 Apr 2012 18:18:48 +0900 tests: fix portability of sed usage in test-mq stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 01 Apr 2012 18:18:48 +0900] rev 16331
tests: fix portability of sed usage in test-mq on some platform (Mac OS X and Solaris, at least), to insert new text line, sed function 'i' should be followed by: - backslash('\'), - new-line, - text to be inserted and - new-line GNU sed on Linux can recognize both previous and new ones as same modification request. in addition to it, this patch avoids to use '-i' option for sed, because it is not so portable, as noted in WritingTests wiki page.
Sat, 31 Mar 2012 15:39:44 -0500 zsh completion: fix error in qfinish completions from 88a82069be4a
Augie Fackler <durin42@gmail.com> [Sat, 31 Mar 2012 15:39:44 -0500] rev 16330
zsh completion: fix error in qfinish completions from 88a82069be4a The actual flag is --applied, not --all.
Sat, 31 Mar 2012 14:05:10 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 14:05:10 -0500] rev 16329
merge with stable
Sat, 31 Mar 2012 14:04:39 -0500 record: fix up test issues
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 14:04:39 -0500] rev 16328
record: fix up test issues sed on BSD requires an arg to -i sed failing exposed an uninitialized variable issue
Sat, 31 Mar 2012 13:46:46 -0500 tests: fix portability of sed expression in test-mq stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 13:46:46 -0500] rev 16327
tests: fix portability of sed expression in test-mq
Sat, 31 Mar 2012 11:19:09 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 11:19:09 -0500] rev 16326
merge with stable
Thu, 29 Mar 2012 22:16:56 +0900 tests: skip test-lfconvert.t if not support symblic link stable
Takumi IINO <trot.thunder@gmail.com> [Thu, 29 Mar 2012 22:16:56 +0900] rev 16325
tests: skip test-lfconvert.t if not support symblic link Windows not support symbolic link. but test-lfconvert.t execute 'ln -s' command. @@ -51,8 +51,6 @@ skipping incorrectly formatted tag IncorrectlyFormattedTag! skipping incorrectly formatted id invalidhash no mapping for id 0123456789abcdef - abort: renamed/copied largefile large3 becomes symlink - [255] $ cd bigfile-repo $ hg strip --no-backup 2 0 files updated, 0 files merged, 2 files removed, 0 files unresolved ERROR: test-lfconvert.t output changed
Fri, 30 Mar 2012 22:08:46 +0100 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com> [Fri, 30 Mar 2012 22:08:46 +0100] rev 16324
record: allow splitting of hunks by manually editing patches It is possible that unrelated changes in a file are on sequential lines. The current record extension does not allow these to be committed independently. An example use case for this is in software development for deeply embedded real-time systems. In these environments, it is not always possible to use a debugger (due to time-constraints) and hence inline UART-based printing is often used. When fixing a bug in a module, it is often convenient to add a large number of 'printf's (linked to the UART via a custom fputc) to the module in order to work out what is going wrong. printf is a very slow function (and also variadic so somewhat frowned upon by the MISRA standard) and hence it is highly undesirable to commit these lines to the repository. If only a partial fix is implemented, however, it is desirable to commit the fix without deleting all of the printf lines. This is also simplifies removal of the printf lines as once the final fix is committed, 'hg revert' does the rest. It is likely that the printf lines will be very near the actual fix, so being able to split the hunk is very useful in this case. There were two alternatives I considered for the user interface. One was to manually edit the patch, the other to allow a hunk to be split into individual lines for consideration. The latter option would require a significant refactor of the record module and is less flexible. While the former is potentially more complicated to use, this is a feature that is likely to only be used in certain exceptional cases (such as the use case proposed above) and hence I felt that the complexity would not be a considerable issue. I've also written a follow-up patch that refactors the 'prompt' code to base everything on the choices variable. This tidies up and clarifies the code a bit (removes constructs like 'if ret == 7' and removes the 'e' option from the file scope options as it's not relevant there. It's not really a necessity, so I've excluded it from this submission for now, but I can send it separately if there's a desire and it's on bitbucket (see below) in the meantime. Possible future improvements include: * Tidying up the 'prompt' code to base everything on the choices variable. This would allow entries to be removed from the prompt as currently 'e' is offered even for entire file patches, which is currently unsupported. * Allowing the entire file (or even multi-file) patch to be edited manually: this would require quite a large refactor without much benefit, so I decided to exclude it from the initial submission. * Allow the option to retry if a patch fails to apply (this is what Git does). This would require quite a bit of refactoring given the current 'hg record' implementation, so it's debatable whether it's worth it. Output is similar to existing record user interface except that an additional option ('e') exists to allow manual editing of the patch. This opens the user's configured editor with the patch. A comment is added to the bottom of the patch explaining what to do (based on Git's one). A large proportion of the changeset is test-case changes to update the options reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in record.py and there are some new test cases in test-record.t.
Sat, 31 Mar 2012 15:55:03 +0900 dirstate: fix some problems for recursive case normalization (issue3342) stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 31 Mar 2012 15:55:03 +0900] rev 16323
dirstate: fix some problems for recursive case normalization (issue3342) file in nested directory causes unexpected abort. problems below should be fixed for recursive normalization route in dirstate._normalize(): 1. rsplit() may cause unpacking into more than 2 elements. it should be called with 'maxsplit' argument to unpack into 'd, f' 2. 'd' is replaced by normalized value prefixed with 'self._root', but this makes 'folded' as absolute path, and it is unexpected one for caller of recursive normalization
Sat, 31 Mar 2012 10:44:31 -0500 tests: add a blacklist for VFAT on Linux stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 16322
tests: add a blacklist for VFAT on Linux
Sat, 31 Mar 2012 10:44:31 -0500 tests: make test-walkrepo use hg's symlink test stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 16321
tests: make test-walkrepo use hg's symlink test
Sat, 31 Mar 2012 10:44:31 -0500 tests: make hghave handle exec bit on Linux with vfat stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 16320
tests: make hghave handle exec bit on Linux with vfat
Sat, 31 Mar 2012 10:44:31 -0500 tests: teach hghave to actually test for symlink support stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 16319
tests: teach hghave to actually test for symlink support
Fri, 30 Mar 2012 14:35:06 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 30 Mar 2012 14:35:06 -0500] rev 16318
merge with stable
Fri, 30 Mar 2012 14:29:50 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Fri, 30 Mar 2012 14:29:50 -0500] rev 16317
merge with i18n
Thu, 29 Mar 2012 22:42:03 +0200 graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu> [Thu, 29 Mar 2012 22:42:03 +0200] rev 16316
graphlog: handle old-style --rev values --rev options cannot be merged into a single revset because we do not know if they are valid revset or old-style revision specifications, like 'foo-bar' tags. Instead, a base revision set is generated with scmutil.revrange() then filtered with the revset built from log options. It also fixes incorrect or hostile expressions passed in --rev.
Thu, 29 Mar 2012 17:13:23 +0200 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu> [Thu, 29 Mar 2012 17:13:23 +0200] rev 16315
test-glog: pretty print revset expressions
Thu, 29 Mar 2012 16:55:08 +0200 graphlog: improve --only-branch handling
Patrick Mezard <patrick@mezard.eu> [Thu, 29 Mar 2012 16:55:08 +0200] rev 16314
graphlog: improve --only-branch handling The previous code was correct for command line as opts always contains the default empty lists for --branch and --only-branch options. But calling graphlog.revset() directly with only --only-branch set would leave it unprocessed.
Sat, 31 Mar 2012 00:04:08 +0900 dirstate: avoid normalizing letter case on icasefs for exact match (issue3340) stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 31 Mar 2012 00:04:08 +0900] rev 16313
dirstate: avoid normalizing letter case on icasefs for exact match (issue3340) on icasefs, "hg qnew" fails to import changing letter case of filename already occurred in working directory, for example: $ hg rename a tmp $ hg rename tmp A $ hg qnew casechange $ hg status R a $ "hg qnew" invokes 'dirstate.walk()' via 'localrepository.commit()' with 'exact match' matching object having exact filenames of targets in ones 'files()'. current implementation of 'dirstate.walk()' always normalizes letter case of filenames from 'match.files()' on icasefs, even though exact matching is required. then, files only different in letter case are treated as one file. this patch prevents 'dirstate.walk()' from normalizing, if exact matching is required, even on icasefs. filenames for 'exact matching' are given not from user command line, but from dirstate walk result, manifest of changecontext, patch files or fixed list for specific system files (e.g.: '.hgtags'). in such case, case normalization should not be done, so this patch works well.
Fri, 30 Mar 2012 21:18:37 +0900 i18n-ja: synchronized with cb17c2f5b7b4 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 30 Mar 2012 21:18:37 +0900] rev 16312
i18n-ja: synchronized with cb17c2f5b7b4
Thu, 29 Mar 2012 18:14:20 -0300 i18n-pt_BR: synchronized with 795d591b6ef5 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 29 Mar 2012 18:14:20 -0300] rev 16311
i18n-pt_BR: synchronized with 795d591b6ef5
Thu, 29 Mar 2012 22:16:56 +0900 tests: skip test-lfconvert.t if not support symblic link
Takumi IINO <trot.thunder@gmail.com> [Thu, 29 Mar 2012 22:16:56 +0900] rev 16310
tests: skip test-lfconvert.t if not support symblic link Windows not support symbolic link. but test-lfconvert.t execute 'ln -s' command. @@ -51,8 +51,6 @@ skipping incorrectly formatted tag IncorrectlyFormattedTag! skipping incorrectly formatted id invalidhash no mapping for id 0123456789abcdef - abort: renamed/copied largefile large3 becomes symlink - [255] $ cd bigfile-repo $ hg strip --no-backup 2 0 files updated, 0 files merged, 2 files removed, 0 files unresolved ERROR: test-lfconvert.t output changed
Fri, 30 Mar 2012 14:16:06 -0500 perf: node lookup
Matt Mackall <mpm@selenic.com> [Fri, 30 Mar 2012 14:16:06 -0500] rev 16309
perf: node lookup
Fri, 23 Mar 2012 01:31:31 +0100 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk> [Fri, 23 Mar 2012 01:31:31 +0100] rev 16308
hgweb: add block numbers to diff regions and related links The changeset view may show several diff regions, one per file, and this patch numbers each of them so that links produced by the filenodelink fragment can reference each diff region produced by the diffblock fragment through the use of the blockno variable made available to both of them. This permits navigation to diff regions on the changeset page from the file list, and where the :target pseudo-class is supported in browsers, permits selective presentation of diffs, showing one at a time instead of potentially many in what would otherwise be a very long page that is difficult to navigate.
Wed, 21 Mar 2012 06:45:07 +0100 patchbomb: add --body flag to send patches as inline message body text
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 21 Mar 2012 06:45:07 +0100] rev 16307
patchbomb: add --body flag to send patches as inline message body text There is currently no way to make patchbomb include patches both as attachments and as inline text. This would be quite convenient when sending patches to people who use web email clients (e.g. gmail) which often mangle the patches, making them hard to apply. The default behavior of the email command is unchanged. However it is now possible to use the --body flag _in addition_ to the -i or -a flags, in which case the patchbomb emails will contain the patch as inline body text and as an attachment. A new test has been added to test-patchbomb.t ("test attach for single patch"), based on the existing test called "test attach for single patch" test.
Wed, 28 Mar 2012 15:25:20 -0400 shrink-revlog: make check-code happier
Greg Ward <greg@gerg.ca> [Wed, 28 Mar 2012 15:25:20 -0400] rev 16306
shrink-revlog: make check-code happier There's still a naked 'except:' clause, but I'm not sure how to fix it (what exception is it expecting?). This just fixes line length.
Wed, 28 Mar 2012 15:15:15 -0400 shrink-revlog: make pyflakes happy
Greg Ward <greg@gerg.ca> [Wed, 28 Mar 2012 15:15:15 -0400] rev 16305
shrink-revlog: make pyflakes happy
Wed, 28 Mar 2012 11:42:17 +0200 revert: move bulk of revert command from commands to cmdutil
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 28 Mar 2012 11:42:17 +0200] rev 16304
revert: move bulk of revert command from commands to cmdutil This revision has no functionality change. The code on the original commands.revert() function has been split. The first part of the original code, which checks that the command inputs are correct remains in commands.revert(). The rest of the function, which performs the actual revert operation has been moved into cmdutil.revert(). The purpose of this change is to make it easier to perform a revert operation, from other parts of the code. This may be used to implement reverting of subrepos.
Thu, 29 Mar 2012 00:35:00 +0200 mq: fix qpush --move with comments in series file between applied patches stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 29 Mar 2012 00:35:00 +0200] rev 16303
mq: fix qpush --move with comments in series file between applied patches The 'start' variable pointed to qtip in self.series, but it was used for indexing self.fullseries. When fullseries had holes and the patch was moved to self.fullseries[start] it would end up too early in self.series and it could thus not be found in self.series[start:] and it would crash. Now the 'fullstart' index in fullseries is found used instead.
Wed, 28 Mar 2012 19:24:13 -0500 dirstate: normalize case of directory components stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 19:24:13 -0500] rev 16302
dirstate: normalize case of directory components If we have an existing f/a, and rename f to F, adding F/b should be normalized to f/b.
Wed, 28 Mar 2012 19:24:11 -0500 tests: fix startup race in test-http-proxy stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 19:24:11 -0500] rev 16301
tests: fix startup race in test-http-proxy
Wed, 28 Mar 2012 19:23:25 -0500 tests: fix startup/shutdown races in test-https stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 19:23:25 -0500] rev 16300
tests: fix startup/shutdown races in test-https tinyproxy now writes its own pid when it's ready to accept connections
Wed, 28 Mar 2012 12:02:38 -0500 tests: remove sleep/startup/shutdown races from test-hup stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 12:02:38 -0500] rev 16299
tests: remove sleep/startup/shutdown races from test-hup
Wed, 28 Mar 2012 11:28:37 -0500 tests: fix shutdown race in test-hgweb-raw stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 11:28:37 -0500] rev 16298
tests: fix shutdown race in test-hgweb-raw
Wed, 28 Mar 2012 10:29:39 -0500 tests: eliminate shutdown race and sleeps in test-serve stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 10:29:39 -0500] rev 16297
tests: eliminate shutdown race and sleeps in test-serve
Wed, 28 Mar 2012 10:11:12 -0500 tests: eliminate daemon race in test-bad-pull stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Mar 2012 10:11:12 -0500] rev 16296
tests: eliminate daemon race in test-bad-pull
Tue, 27 Mar 2012 16:17:46 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 16:17:46 -0500] rev 16295
merge with stable
Tue, 27 Mar 2012 16:13:59 -0500 alias: abort on missing positional args (issue3331) stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 16:13:59 -0500] rev 16294
alias: abort on missing positional args (issue3331)
Wed, 15 Feb 2012 17:30:21 -0500 phases: fix a non-standard debug message stable
Greg Ward <greg@gerg.ca> [Wed, 15 Feb 2012 17:30:21 -0500] rev 16293
phases: fix a non-standard debug message - add missing newline - ditch gratuitous use of string formatting with dict - fix so it actually does string formatting ('%' rather than ',') - inline unnecessary local variable - downcase first word
Sat, 24 Mar 2012 22:13:17 -0500 convert/git: abort if git submodules are detected (issue2150) stable
Augie Fackler <durin42@gmail.com> [Sat, 24 Mar 2012 22:13:17 -0500] rev 16292
convert/git: abort if git submodules are detected (issue2150) This improves the error message when convert encounters a git submodule. Now, instead of a git-cat-file error, we'll directly report the lack of support for git submodules.
Tue, 27 Mar 2012 14:37:17 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:37:17 -0500] rev 16291
merge with stable
Sat, 24 Mar 2012 12:06:49 +0100 qfinish: comply with the phases.new-commit option in secret mode (issue3335) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 24 Mar 2012 12:06:49 +0100] rev 16290
qfinish: comply with the phases.new-commit option in secret mode (issue3335) In secret mode qfinished changeset were move to the draft phase in all case[1] without regard to phases.new-commit value This changeset ensure qfinish does not automatically promote a changeset further than the phases.new-commit value. Note: This may also result in qfinished changeset made public if phases.new-commit is set to public. [1] "In all case" where parent have a compatible phase. Qfinish keep never altering phases of changeset not involved in the qfinish.
Wed, 21 Mar 2012 22:16:12 -0400 test-gpg: make sure gpg does not modify the trustdb.gpg file stable
Greg Ward <greg@gerg.ca> [Wed, 21 Mar 2012 22:16:12 -0400] rev 16289
test-gpg: make sure gpg does not modify the trustdb.gpg file Tests really should not modify files in the Mercurial working dir where they ran from! I suspect that trustdb.gpg is now old enough that GPG thinks it should update it automatically. Suppress that feature with --no-auto-check-trustdb.
Tue, 27 Mar 2012 13:57:54 -0500 tests: remove case-folding false positive stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 13:57:54 -0500] rev 16288
tests: remove case-folding false positive
Tue, 27 Mar 2012 14:35:58 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:35:58 -0500] rev 16287
merge with i18n
Tue, 27 Mar 2012 20:37:52 +0900 i18n-ja: synchronized with 900eee0778d1 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 27 Mar 2012 20:37:52 +0900] rev 16286
i18n-ja: synchronized with 900eee0778d1
Mon, 26 Mar 2012 16:42:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:42:53 -0500] rev 16285
merge with stable
Mon, 26 Mar 2012 16:41:54 -0500 merge: fix unknown file merge detection for case-folding systems
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:41:54 -0500] rev 16284
merge: fix unknown file merge detection for case-folding systems This was triggering some test failures on Mac.
Fri, 23 Mar 2012 11:47:27 -0500 rename: handle case-changing (issue1717) stable
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2012 11:47:27 -0500] rev 16283
rename: handle case-changing (issue1717)
Thu, 22 Mar 2012 23:58:47 +0900 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 22 Mar 2012 23:58:47 +0900] rev 16282
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check original implementation queries whether specified pattern is related or not to largefiles in target context by 'dirstate.__contains__()'. but this can't recognize 'directory pattern' correctly, so this patch uses 'dirstate.dirs()' for it. this patch uses dirstate instead of lfdirstate in 'working' route (second patch hunk for 'hgext/largefiles/reposetup.py'), because 'dirs()' information may be already built for dirstate but not yet for lfdirstate at this point. this prevents lfdirstate from building up and having 'dirs()' information.
Thu, 22 Mar 2012 23:58:47 +0900 largefiles: suppress unexpected warning of 'hg status' for removed files stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 22 Mar 2012 23:58:47 +0900] rev 16281
largefiles: suppress unexpected warning of 'hg status' for removed files original implementation queries whether specified pattern is related or not to largefiles, to target context. but changectx/workingctx returns False about relationship with files marked as removed. So, 'hg status' with 'file pattern' for removed file shows unexpected warning message in below process: 1. 'tostandin()' returns non-STANDIN filename for removed file, because changectx/workingctx returns False about relationship with it 2. 'match.files()' contains non-STANDIN filename, which is already removed from working directory 3. 'dirstate.walk()' invoked via 'localrepository.status()' treats non-STANDIN filename as bad filename, because there is no entry for it in dirstate: only STANDIN is managed in dirstate 4. 'dirstate.walk()' invokes 'match.bad()', which is defined in 'localrepository.status()' as 'bad()' 5. 'bad()' shows warning message for non-STANDIN, because it is not related to source context: only STANDIN is related to it this patch queries to dirstate instead of changectxt/workingctx, because dirstate returns expected result for removed files. 'match.files()' is used by 'localrepository.status()' only in 'working' case, so this patched code also works correctly in non-'working' case.
Thu, 22 Mar 2012 17:47:00 -0500 rebase: properly calculate descendant set when aborting (issue3332) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:47:00 -0500] rev 16280
rebase: properly calculate descendant set when aborting (issue3332) Checking for descendants of target being public was also wrong.
Thu, 22 Mar 2012 17:08:05 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:08:05 -0500] rev 16279
merge with stable
Thu, 22 Mar 2012 17:07:39 -0500 strip: ignore -n (issue3326) (BC) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16278
strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned.
Thu, 22 Mar 2012 17:07:39 -0500 aliases: use empty string for missing position parameters (issue3331) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16277
aliases: use empty string for missing position parameters (issue3331)
Wed, 21 Mar 2012 16:39:38 -0500 bookmarks: clone non-divergent bookmarks with @ in them stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 21 Mar 2012 16:39:38 -0500] rev 16276
bookmarks: clone non-divergent bookmarks with @ in them
Wed, 21 Mar 2012 17:24:15 +0900 i18n-ja: synchronized with 2338ab19b236 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 21 Mar 2012 17:24:15 +0900] rev 16275
i18n-ja: synchronized with 2338ab19b236
Thu, 22 Mar 2012 16:54:46 -0500 encoding: tune fast-path of tolocal a bit
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 16:54:46 -0500] rev 16274
encoding: tune fast-path of tolocal a bit
Thu, 15 Mar 2012 16:57:19 +0100 eol: remove left-over print statements
Martin Geisler <mg@aragost.com> [Thu, 15 Mar 2012 16:57:19 +0100] rev 16273
eol: remove left-over print statements
Thu, 15 Mar 2012 16:52:22 +0100 eol: document why os.utime doesn't work here
Martin Geisler <mg@aragost.com> [Thu, 15 Mar 2012 16:52:22 +0100] rev 16272
eol: document why os.utime doesn't work here I wanted to use os.utime(self.join("eol.cache"), None) as a cleaner way of touching the cache file -- but this fails when the cache doesn't exist.
Sun, 18 Mar 2012 18:21:58 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:58 -0500] rev 16271
merge with stable
Sun, 18 Mar 2012 18:21:32 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:32 -0500] rev 16270
merge with i18n
Wed, 14 Mar 2012 16:26:14 -0300 i18n-pt_BR: fix format.dotencode help section stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 14 Mar 2012 16:26:14 -0300] rev 16269
i18n-pt_BR: fix format.dotencode help section
Wed, 14 Mar 2012 12:52:50 -0300 i18n-pt_BR: synchronized with 3d26d69ef822 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 14 Mar 2012 12:52:50 -0300] rev 16268
i18n-pt_BR: synchronized with 3d26d69ef822
Sun, 18 Mar 2012 18:19:16 -0500 changelog: micro-optimizations to changelog.read()
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:19:16 -0500] rev 16267
changelog: micro-optimizations to changelog.read()
Fri, 16 Mar 2012 19:58:47 -0500 perf: add a changeset test
Matt Mackall <mpm@selenic.com> [Fri, 16 Mar 2012 19:58:47 -0500] rev 16266
perf: add a changeset test
Fri, 16 Mar 2012 17:42:21 -0500 convert: deal with empty splicemap path (issue3311) stable
Matt Mackall <mpm@selenic.com> [Fri, 16 Mar 2012 17:42:21 -0500] rev 16265
convert: deal with empty splicemap path (issue3311)
Thu, 15 Mar 2012 23:02:31 +0000 tests: ignore git's output in test-subrepo-git.t stable
Javi Merino <cibervicho@gmail.com> [Thu, 15 Mar 2012 23:02:31 +0000] rev 16264
tests: ignore git's output in test-subrepo-git.t git version 1.7.9.1 makes the testsuite fail with: @@ -482,7 +482,17 @@ Sticky repository, update --clean $ hg update --clean tip - Previous HEAD position was aa84837... f + Warning: you are leaving 2 commits behind, not connected to + any of your branches: + + aa84837 f + 126f2a1 gg + + If you want to keep them by creating a new branch, this may be a good time + to do so with: + + git branch new_branch_name aa84837ccfbdfedcdcdeeedc309d73e6eb069edc + HEAD is now at 32a3438... fff 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n ERROR: test-subrepo-git.t output changed
Thu, 15 Mar 2012 15:59:26 -0500 profile: add undocumented config options for profiler output
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 15:59:26 -0500] rev 16263
profile: add undocumented config options for profiler output
Thu, 15 Mar 2012 15:58:55 -0500 perf: add perfchangeset to time changeset parsing
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 15:58:55 -0500] rev 16262
perf: add perfchangeset to time changeset parsing
Thu, 15 Mar 2012 13:11:42 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 13:11:42 -0500] rev 16261
merge with stable
Thu, 15 Mar 2012 13:11:03 -0500 perf: tweak tests for testing index performance improvements
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 13:11:03 -0500] rev 16260
perf: tweak tests for testing index performance improvements
Wed, 14 Mar 2012 01:13:45 +0100 convert: support non annotated tags in git backend
Edouard Gomez <ed.gomez@free.fr> [Wed, 14 Mar 2012 01:13:45 +0100] rev 16259
convert: support non annotated tags in git backend Do not blindly filter out non ending ^{} tags. The new logic is: - if both "tag" and "tag^{}" exist, "tag^{}" is what we want - if only "tag" exists, "tag" is fine
Thu, 15 Mar 2012 00:46:37 +0900 icasefs: use case preserved root for 'util.fspath()' invocation (issue3302) stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 15 Mar 2012 00:46:37 +0900] rev 16258
icasefs: use case preserved root for 'util.fspath()' invocation (issue3302) path to repo root may contains case sensitive part, even though repo is located in case insensitive filesystem: e.g. repo in FAT32 device mounted on Unix. so, case normalized root causes failure of stat(2). this patch uses case preserved root for 'util.fspath()' invocation to avoid this problem. case preserved root for 'util.fspath()' may decrease efficiency of fspath cache, but 'util.fspath()' is currently called only from dirstate, so this fix has less impact.
Wed, 14 Mar 2012 14:45:41 -0500 merge: accept missing revisions in symlink flag merge (issue3316) stable
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2012 14:45:41 -0500] rev 16257
merge: accept missing revisions in symlink flag merge (issue3316)
Tue, 13 Mar 2012 16:29:13 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 16:29:13 -0500] rev 16256
merge with stable
Tue, 13 Mar 2012 16:28:08 -0500 merge: handle linear update to symlink correctly (issue3316) stable
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 16:28:08 -0500] rev 16255
merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.
Tue, 13 Mar 2012 15:12:26 -0500 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 stable
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 15:12:26 -0500] rev 16254
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 This could result in a traceback.
Mon, 12 Mar 2012 17:05:42 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Mar 2012 17:05:42 -0500] rev 16253
merge with stable
Mon, 12 Mar 2012 17:02:45 -0300 strip: enhance repair.strip to receive a list of nodes (issue3299) stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 12 Mar 2012 17:02:45 -0300] rev 16252
strip: enhance repair.strip to receive a list of nodes (issue3299) Originally, mq.strip called repair.strip a single rev at a time. repair.strip stores in a backup bundle any revision greater than the revision being stripped, strips, then restores the backup with repo.addchangegroup. So, when stripping revisions on more than one topological branch, some could end up being restored from the backup bundle, only to be later removed by a subsequent repair.strip call. But repo.addchangegroup calls hooks for all those restore operations. And 9df9444e96ec changed it to delay all hook calls until the repository lock were released - by mq.strip, after stripping all revisions. Thus, the hooks could be called over revisions already removed from the repository at that point. By generating the revision lists at once inside repo.strip, we avoid calling addchangegroup for temporary restores. Incidentally, this also avoids creating many backup files for a single strip command.
Wed, 07 Mar 2012 01:02:12 +0100 templates/filters: add doctest to the 'person' filter
"Yann E. MORIN" <yann.morin.1998@free.fr> [Wed, 07 Mar 2012 01:02:12 +0100] rev 16251
templates/filters: add doctest to the 'person' filter Add a doctest with an hopefuly-comprehensive list of combinations we can expect in real-life situations. This does not cover corner cases, for example when a CR or LF is embedded in the name (allowed by RFC 5322!). Code in tests/test-doctest.py contributed by: Martin Geisler <mg@aragost.com> Thanks! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Fri, 09 Mar 2012 22:54:17 +0100 help: strip doctest from dochelp
"Yann E. MORIN" <yann.morin.1998@free.fr> [Fri, 09 Mar 2012 22:54:17 +0100] rev 16250
help: strip doctest from dochelp When a dochelp string contains doctest code, the doctest code is not stripped, so the help also displays the doctest. Just stop parsing dochelp at the first hint of a doctest section (starting with >>>). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Mon, 12 Mar 2012 13:37:39 -0500 pvec: introduce pvecs
Matt Mackall <mpm@selenic.com> [Mon, 12 Mar 2012 13:37:39 -0500] rev 16249
pvec: introduce pvecs
Fri, 09 Mar 2012 17:11:07 +0100 largefiles: fix check-code errors.
Na'Tosha Bard <natosha@unity3d.com> [Fri, 09 Mar 2012 17:11:07 +0100] rev 16248
largefiles: fix check-code errors.
Fri, 09 Mar 2012 16:11:52 +0100 largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com> [Fri, 09 Mar 2012 16:11:52 +0100] rev 16247
largefiles: remove use of underscores that breaks coding convention
Fri, 09 Mar 2012 15:26:13 +0100 largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com> [Fri, 09 Mar 2012 15:26:13 +0100] rev 16246
largefiles: only update changed largefiles when transplanting
Fri, 09 Mar 2012 16:45:49 +0100 largefiles: move calculation of largefiles for updating to utility function
Na'Tosha Bard <natosha@unity3d.com> [Fri, 09 Mar 2012 16:45:49 +0100] rev 16245
largefiles: move calculation of largefiles for updating to utility function
Mon, 12 Mar 2012 13:22:28 +0100 help: add verb to sentence in phases.txt stable
Johan Samyn <johan.samyn@gmail.com> [Mon, 12 Mar 2012 13:22:28 +0100] rev 16244
help: add verb to sentence in phases.txt
Fri, 09 Mar 2012 15:34:21 -0500 localrepo: fix unpushable repos when using bookmarks (issue3317) stable
Michael Bacarella <mbacarella@janestreet.com> [Fri, 09 Mar 2012 15:34:21 -0500] rev 16243
localrepo: fix unpushable repos when using bookmarks (issue3317) bookmarks is copied to journal.bookmarks differently from how dirstate is copied to journal.dirstate. The different way is less robust, which can render the repo unpushable by other users if the first pushing user aborts their transaction. The underlying cause is that the copyfile method attempts an unnecessary chmod, which fails if the user is not the owner of the journal.bookmarks file. This patch makes the bookmarks journaling more consistent with the rest of the journaling, and will allow users to update lingering journal.bookmarks files that they're not the owners of.
Mon, 12 Mar 2012 09:39:30 +0100 extdiff: escape filenames with vim/DirDiff and make quoting work with Windows stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 12 Mar 2012 09:39:30 +0100] rev 16242
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows Use vim function fnameescape() on filenames. Use double quotes for arguments so cmd.exe is happy.
Thu, 08 Mar 2012 15:59:47 -0600 posix: disable cygwin's symlink emulation
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:47 -0600] rev 16241
posix: disable cygwin's symlink emulation
Thu, 08 Mar 2012 20:17:36 +0000 posix: ignore execution bit in cygwin (issue3301)
A. S. Budden <abudden@gmail.com> [Thu, 08 Mar 2012 20:17:36 +0000] rev 16240
posix: ignore execution bit in cygwin (issue3301)
Sat, 18 Feb 2012 20:10:19 +0100 hgweb: support multi-level repository indexes by enabling descend and collapse
Paul Boddie <paul@boddie.org.uk> [Sat, 18 Feb 2012 20:10:19 +0100] rev 16239
hgweb: support multi-level repository indexes by enabling descend and collapse The descend option in hgweb can be used to display all reachable repositories within a directory hierarchy if set to True. However, all reachable repositories, regardless of their depth below the root of the hierarchy, are then listed at the same level - expanded - in the hgweb interface. This patch adds support for showing only each level of a directory hierarchy, with subrepositories being shown alongside their parent repositories only at the appropriate level (because there is no way to navigate to subrepositories from within repositories), and the contents of directories hidden - collapsed - behind a link for each directory. To enable this multi-level navigation, a new option called collapse must be set to True when the descend option is set to True.
Tue, 06 Mar 2012 18:43:05 +0200 mq: no need to delete undo files after strip
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:43:05 +0200] rev 16238
mq: no need to delete undo files after strip repair.strip takes care of that
Tue, 06 Mar 2012 18:43:05 +0200 repair: remove undo files after strip
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:43:05 +0200] rev 16237
repair: remove undo files after strip
Tue, 06 Mar 2012 18:42:52 +0200 localrepo: refactor retrieving of journal/undo files paths
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:42:52 +0200] rev 16236
localrepo: refactor retrieving of journal/undo files paths We'd like to remove undo files after stripping
Tue, 06 Mar 2012 23:23:30 +0100 templates/filters: strip quotes from {author|person}
"Yann E. MORIN" <yann.morin.1998@free.fr> [Tue, 06 Mar 2012 23:23:30 +0100] rev 16235
templates/filters: strip quotes from {author|person} RFC5322 (Internet Message Format) [0] says that the 'display name' of an internet address [1] (what Mercurial calls 'person') can be quoted with DQUOTE (ASCII 34: ") if it contains non-atom characters [2]. For example, dot '.' is a non-atom character. Also, DQUOTEs in a quoted string will be escaped using "\" [2][3]. The current {author|person} template+filter just extracts the part before an email address as-is. This can look ugly, especially on the web interface, or when generating output for post-processing... Moreover, as an example, the Mercurial repository has a bunch of incoherent uses of DQUOTES in author names. As per Matt's digging: $ hg log --template "{author|person}\n" | grep '"' | sort | uniq "Andrei Vermel "Aurelien Jacobs "Daniel Santa Cruz "Hidetaka Iwai "Hiroshi Funai" "Mathieu Clabaut "Paul Moore "Peter Arrenbrecht" "Rafael Villar Burke "Shun-ichi GOTO" "Wallace, Eric S" "Yann E. MORIN" Josef "Jeff" Sipek Radoslaw "AstralStorm" Szkodzinski Fix the 'person' filter to remove leading and trailing DQUOTES, and unescape remaining DQUOTES. Given this author: "J. \"random\" DOE" <john@doe.net> before: {author|person} : "J. \"random\" DOE" after: {author|person} : J. "random" DOE For the Mercurial repository, that leaves us with two authors with DQUOTES, in acceptable positions: $ hg log --template "{author|person}\n" | grep '"' | sort | uniq Josef "Jeff" Sipek Radoslaw "AstralStorm" Szkodzinski [0] https://tools.ietf.org/html/rfc5322 [1] https://tools.ietf.org/html/rfc5322#section-3.4 [2] https://tools.ietf.org/html/rfc5322#section-3.2.4 [3] https://tools.ietf.org/html/rfc5322#section-3.2.1 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu, 08 Mar 2012 15:59:44 -0600 check-code: check for % inside _()
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:44 -0600] rev 16234
check-code: check for % inside _()
Thu, 08 Mar 2012 15:59:41 -0600 patchbomb: add (optional) note to 0 of 0 prompt
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:41 -0600] rev 16233
patchbomb: add (optional) note to 0 of 0 prompt
Thu, 08 Mar 2012 15:59:33 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:33 -0600] rev 16232
merge with stable
Thu, 08 Mar 2012 13:35:27 -0600 i18n: fix all remaining uses of % inside _() stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 13:35:27 -0600] rev 16231
i18n: fix all remaining uses of % inside _()
Wed, 07 Mar 2012 23:21:11 +0000 update: don't translate the abort message twice stable
Javi Merino <cibervicho@gmail.com> [Wed, 07 Mar 2012 23:21:11 +0000] rev 16230
update: don't translate the abort message twice The string representation of util.Abort() is translated when merge.update() raises the exception. For languages with characters out of the valid ascii range, if we feed them again to i18n.gettext() mercurial dies with: [...] File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming ui.warn(_("not updating: %s\n" % str(inst))) File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs]) File "/usr/lib/python2.7/gettext.py", line 404, in ugettext return unicode(message) UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128) To reproduce this error, just try to pull a changeset that crosses branches with LANG=ru_RU.UTF-8
Sun, 04 Mar 2012 17:14:30 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 17:14:30 -0600] rev 16229
merge with stable
Sun, 04 Mar 2012 17:12:12 -0600 rebase: move bookmarks as needed with pull --rebase (issue3285) stable
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 17:12:12 -0600] rev 16228
rebase: move bookmarks as needed with pull --rebase (issue3285)
Sun, 04 Mar 2012 16:48:04 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 16:48:04 -0600] rev 16227
merge with stable
Thu, 01 Mar 2012 14:42:23 +0000 bugzilla: correct comment typo stable
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 14:42:23 +0000] rev 16226
bugzilla: correct comment typo
Thu, 01 Mar 2012 23:29:52 +0000 tests: ignore the return code of chmod in test-inherit-mode stable
Javi Merino <cibervicho@gmail.com> [Thu, 01 Mar 2012 23:29:52 +0000] rev 16225
tests: ignore the return code of chmod in test-inherit-mode In freebsd, a newly created directory has the same group as the parent directory by default. That means that the test directory created by test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store" fails to set the SGID bit and returns 1. If we ignore chmod's return code, the testsuite passes again.
Thu, 01 Mar 2012 14:50:31 +0000 bugzilla: add xmlrpcemail submission for Bugzilla 3.6 email interface
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 14:50:31 +0000] rev 16224
bugzilla: add xmlrpcemail submission for Bugzilla 3.6 email interface Some of the formatting details required for bug submission via email changed between Bugzilla 3.4 and 3.6. Bugzilla 3.4 requires lines of the form '@fieldname = value', while 3.6 wants '@fieldname value'. Also the field @bug_id in 3.4 becomes @id in 3.6. Bugzilla up to and including 4.0 also recognises the 3.4 format. To save surprises in the future, check the Bugzilla version and use the 3.6 format from all major versions >= 4. At some point we will drop support for Bugzilla prior to 3.6 and support the new format only.
Thu, 01 Mar 2012 15:27:24 +0000 bugzilla: allow change comment to mark bugs fixed
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 15:27:24 +0000] rev 16223
bugzilla: allow change comment to mark bugs fixed Add a second regular expression used when scanning change comments. Bugs matched by this new regular expression have the bug comments and optionally hours updated as with the first regular expression, but they are also marked as fixed. The bug status and resolution to set to mark a bug as fixed can be configured. By default status is set to RESOLVED and resolution to FIXED, the default Bugzilla settings. For example, a change comment containing 'Fixes 1234 h1.5' will be added to bug 1234, the bug will have its working time increased by 1.65 hours, and the bug will be marked RESOLVED/FIXED. Change comments may contain both bug update and fix instructions. If the same bug ID occurs in both, the last instruction found takes precedence. The patch adds new bug states 'bug_status' and 'resolution' and actions to update them to the XMLRPC and XMLRPC/email access methods. XMLRPC does not support marking bugs as fixed when used with Bugzilla versions prior to 4.0. When used with an earlier Bugzilla version, a warning is issued and only comment and hours updated.
Thu, 01 Mar 2012 15:25:37 +0000 bugzilla: extract optional hours from commit message and update bug time
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 15:25:37 +0000] rev 16222
bugzilla: extract optional hours from commit message and update bug time If an 'hours' group is present in the bug matching regular expression, and that group contains a float value, update the bug working time in Bugzilla with those hours. The patch adds a key 'hours' to the bug state dictionary, and adds support for the key to the XMLRPC and XMLRPC/email access methods. The MySQL access method is not supported; a warning is given.
Thu, 01 Mar 2012 14:51:40 +0000 bugzilla: modify access interface to include new bug states
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 14:51:40 +0000] rev 16221
bugzilla: modify access interface to include new bug states As a first step to allowing comment text to update bug state, rework the Bugzilla access interface to use a dictionary keyed on bug ID. Dictionary entries will contain new state info in future changes.
Sat, 03 Mar 2012 23:14:31 -0600 wix: add phases help text and two more translations (issue 3288) stable
Steve Borho <steve@borho.org> [Sat, 03 Mar 2012 23:14:31 -0600] rev 16220
wix: add phases help text and two more translations (issue 3288)
Fri, 02 Mar 2012 11:46:18 -0300 debugbuilddag: fix starting a dag on a non-default branch stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 02 Mar 2012 11:46:18 -0300] rev 16219
debugbuilddag: fix starting a dag on a non-default branch
Fri, 24 Feb 2012 11:02:21 +0100 debugrevspec: pretty print output
Patrick Mezard <patrick@mezard.eu> [Fri, 24 Feb 2012 11:02:21 +0100] rev 16218
debugrevspec: pretty print output Before: ('func', ('symbol', 'reverse'), ('func', ('symbol', 'sort'), ('list', ('or', ('symbol', '2'), ('symbol', '3')), ('symbol', 'date')))) After: (func ('symbol', 'reverse') (func ('symbol', 'sort') (list (or ('symbol', '2') ('symbol', '3')) ('symbol', 'date')))) v2: - Rebased on stable to avoid having to merge tests output
Fri, 02 Mar 2012 21:43:55 +0200 readme: mention how to run in-place
Ross Lagerwall <rosslagerwall@gmail.com> [Fri, 02 Mar 2012 21:43:55 +0200] rev 16217
readme: mention how to run in-place The README describes how to install Mercurial but it does not describe how to run it in place (for developers). This adds a short paragraph to the README describing how to do run Mercurial inplace.
Fri, 02 Mar 2012 14:12:06 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 02 Mar 2012 14:12:06 -0600] rev 16216
merge with stable
Fri, 02 Mar 2012 14:11:06 -0600 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Fri, 02 Mar 2012 14:11:06 -0600] rev 16215
merge with i18n
Wed, 29 Feb 2012 13:17:41 -0300 i18n-pt_BR: synchronized with 6b52963ced73 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Feb 2012 13:17:41 -0300] rev 16214
i18n-pt_BR: synchronized with 6b52963ced73
Wed, 29 Feb 2012 13:16:51 -0300 merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Feb 2012 13:16:51 -0300] rev 16213
merge with i18n
Wed, 29 Feb 2012 21:09:21 +0900 i18n-ja: synchronized with 87d37aceb5e3 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 29 Feb 2012 21:09:21 +0900] rev 16212
i18n-ja: synchronized with 87d37aceb5e3
(0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 +30000 tip