Mercurial > hg-stable
changeset 23928:ca6cfc2f8197 stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 20 Jan 2015 14:51:11 -0800 |
| parents | fea3416f2440 (diff) 6e02afd6c728 (current diff) |
| children | a43fdf33a6be |
| files | |
| diffstat | 8 files changed, 50 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/color.py Sun Jan 18 11:16:45 2015 -0200 +++ b/hgext/color.py Tue Jan 20 14:51:11 2015 -0800 @@ -156,7 +156,7 @@ # start and stop parameters for effects _effects = {'none': 0, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, 'blue': 34, 'magenta': 35, 'cyan': 36, 'white': 37, 'bold': 1, - 'italic': 3, 'underline': 4, 'inverse': 7, + 'italic': 3, 'underline': 4, 'inverse': 7, 'dim': 2, 'black_background': 40, 'red_background': 41, 'green_background': 42, 'yellow_background': 43, 'blue_background': 44, 'purple_background': 45,
--- a/hgext/convert/hg.py Sun Jan 18 11:16:45 2015 -0200 +++ b/hgext/convert/hg.py Tue Jan 20 14:51:11 2015 -0800 @@ -467,7 +467,7 @@ def lookuprev(self, rev): try: return hex(self.repo.lookup(rev)) - except error.RepoError: + except (error.RepoError, error.LookupError): return None def getbookmarks(self):
--- a/hgext/largefiles/reposetup.py Sun Jan 18 11:16:45 2015 -0200 +++ b/hgext/largefiles/reposetup.py Tue Jan 20 14:51:11 2015 -0800 @@ -326,7 +326,12 @@ if self.dirstate.normalize(lf).startswith(d): actualfiles.append(lf) if not matcheddir: - actualfiles.append(lfutil.standin(f)) + # There may still be normal files in the dir, so + # make sure a directory is in the list, which + # forces status to walk and call the match + # function on the matcher. Windows does NOT + # require this. + actualfiles.append('.') matcheddir = True # Nothing in dir, so readd it # and let commit reject it
--- a/mercurial/patch.py Sun Jan 18 11:16:45 2015 -0200 +++ b/mercurial/patch.py Tue Jan 20 14:51:11 2015 -0800 @@ -1831,10 +1831,7 @@ header.append('new file mode %s\n' % mode) elif ctx2.flags(f): losedatafn(f) - # In theory, if tn was copied or renamed we should check - # if the source is binary too but the copy record already - # forces git mode. - if util.binary(tn): + if util.binary(to) or util.binary(tn): if opts.git: binarydiff = True else:
--- a/tests/test-diff-binary-file.t Sun Jan 18 11:16:45 2015 -0200 +++ b/tests/test-diff-binary-file.t Tue Jan 20 14:51:11 2015 -0800 @@ -9,6 +9,9 @@ $ hg revert -r 0 binfile.bin $ hg ci -m 'revert binfile.bin' + $ hg cp binfile.bin nonbinfile + $ echo text > nonbinfile + $ hg ci -m 'make non-binary copy of binary file' $ hg diff --nodates -r 0 -r 1 diff -r 48b371597640 -r acea2ab458c8 binfile.bin @@ -41,4 +44,14 @@ diff --git a/binfile.bin b/binfile.bin Binary file binfile.bin has changed + $ hg diff --git -r 2 -r 3 + diff --git a/binfile.bin b/nonbinfile + copy from binfile.bin + copy to nonbinfile + index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..8e27be7d6154a1f68ea9160ef0e18691d20560dc + GIT binary patch + literal 5 + Mc$_OqttjCF00uV!&;S4c + + $ cd ..
--- a/tests/test-histedit-commute.t Sun Jan 18 11:16:45 2015 -0200 +++ b/tests/test-histedit-commute.t Tue Jan 20 14:51:11 2015 -0800 @@ -417,8 +417,8 @@ $ HGEDITOR="sh ./editor.sh" hg histedit 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - adding another-dir/initial-file - removing initial-dir/initial-file + adding another-dir/initial-file (glob) + removing initial-dir/initial-file (glob) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-subrepo-deep-nested-change.t Sun Jan 18 11:16:45 2015 -0200 +++ b/tests/test-subrepo-deep-nested-change.t Tue Jan 20 14:51:11 2015 -0800 @@ -351,5 +351,30 @@ R sub1/sub2/test.txt ? foo/bar/abc ? sub1/sub2/untracked.txt + $ hg add sub1/sub2 + $ hg ci -Sqm 'forget testing' + +Test issue4330: commit a directory where only normal files have changed + $ touch foo/bar/large.dat + $ hg add --large foo/bar/large.dat + $ hg ci -m 'add foo/bar/large.dat' + $ touch a.txt + $ touch a.dat + $ hg add -v foo/bar/abc a.txt a.dat + adding a.dat as a largefile + adding a.txt + adding foo/bar/abc (glob) + $ hg ci -m 'dir commit with only normal file deltas' foo/bar + $ hg status + A a.dat + A a.txt + +Test a directory commit with a changed largefile and a changed normal file + $ echo changed > foo/bar/large.dat + $ echo changed > foo/bar/abc + $ hg ci -m 'dir commit with normal and lf file deltas' foo + $ hg status + A a.dat + A a.txt $ cd ..
--- a/tests/test-tools.t Sun Jan 18 11:16:45 2015 -0200 +++ b/tests/test-tools.t Tue Jan 20 14:51:11 2015 -0800 @@ -94,13 +94,10 @@ 0000: 79 61 64 64 61 |yadda| #else $ f -qr dir -HB 17 - dir: directory with 3 files + dir: directory with 2 files\r (esc) dir/bar: (glob) 0000: 31 0a 32 0a 33 0a 34 0a 35 0a 36 0a 37 0a 38 0a |1.2.3.4.5.6.7.8.| 0010: 39 |9| - dir/baz: (glob) - 0000: 31 0a 32 0a 33 0a 34 0a 35 0a 36 0a 37 0a 38 0a |1.2.3.4.5.6.7.8.| - 0010: 39 |9| dir/foo: (glob) 0000: 66 6f 6f 0a |foo.| #endif