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.
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.
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:08:05 -0500] rev 16279
merge with 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.
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16277
aliases: use empty string for missing position parameters (
issue3331)
Kevin Bullock <kbullock@ringworld.org> [Wed, 21 Mar 2012 16:39:38 -0500] rev 16276
bookmarks: clone non-divergent bookmarks with @ in them
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 21 Mar 2012 17:24:15 +0900] rev 16275
i18n-ja: synchronized with
2338ab19b236
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 16:54:46 -0500] rev 16274
encoding: tune fast-path of tolocal a bit
Martin Geisler <mg@aragost.com> [Thu, 15 Mar 2012 16:57:19 +0100] rev 16273
eol: remove left-over print statements
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.
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:58 -0500] rev 16271
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:32 -0500] rev 16270
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 14 Mar 2012 16:26:14 -0300] rev 16269
i18n-pt_BR: fix format.dotencode help section
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 14 Mar 2012 12:52:50 -0300] rev 16268
i18n-pt_BR: synchronized with
3d26d69ef822
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:19:16 -0500] rev 16267
changelog: micro-optimizations to changelog.read()
Matt Mackall <mpm@selenic.com> [Fri, 16 Mar 2012 19:58:47 -0500] rev 16266
perf: add a changeset test
Matt Mackall <mpm@selenic.com> [Fri, 16 Mar 2012 17:42:21 -0500] rev 16265
convert: deal with empty splicemap path (
issue3311)
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
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 15:59:26 -0500] rev 16263
profile: add undocumented config options for profiler output
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 15:58:55 -0500] rev 16262
perf: add perfchangeset to time changeset parsing
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 13:11:42 -0500] rev 16261
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2012 13:11:03 -0500] rev 16260
perf: tweak tests for testing index performance improvements
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
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.