Mercurial > hg
annotate tests/test-lfs-pointer.py @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
rev | line source |
---|---|
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
1 from __future__ import absolute_import, print_function |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
2 |
37928
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
3 # Import something from Mercurial, so the module loader gets initialized. |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
4 from mercurial import pycompat |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
5 |
37928
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
6 del pycompat # unused for now |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
7 |
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
8 from hgext.lfs import pointer |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
9 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
10 |
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
11 def tryparse(text): |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
12 r = {} |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
13 try: |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
14 r = pointer.deserialize(text) |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
15 print('ok') |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
16 except Exception as ex: |
37928
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
17 print((b'%s' % ex).decode('ascii')) |
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
18 if r: |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
19 text2 = r.serialize() |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
20 if text2 != text: |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
21 print('reconstructed text differs') |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
22 return r |
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
23 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
24 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
25 t = ( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
26 b'version https://git-lfs.github.com/spec/v1\n' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
27 b'oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
28 b'258daaa5e2ca24d17e2393\n' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
29 b'size 12345\n' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
30 b'x-foo extra-information\n' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
40098
diff
changeset
|
31 ) |
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
32 |
37928
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
33 tryparse(b'') |
35098
66c5a8cf2868
lfs: import the Facebook git-lfs client extension
Matt Harbison <matt_harbison@yahoo.com>
parents:
diff
changeset
|
34 tryparse(t) |
37928
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
35 tryparse(t.replace(b'git-lfs', b'unknown')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
36 tryparse(t.replace(b'v1\n', b'v1\n\n')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
37 tryparse(t.replace(b'sha256', b'ahs256')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
38 tryparse(t.replace(b'sha256:', b'')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
39 tryparse(t.replace(b'12345', b'0x12345')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
40 tryparse(t.replace(b'extra-information', b'extra\0information')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
41 tryparse(t.replace(b'extra-information', b'extra\ninformation')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
42 tryparse(t.replace(b'x-foo', b'x_foo')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
43 tryparse(t.replace(b'oid', b'blobid')) |
7cd1e1adc471
tests: port test-lfs-pointer.py to Python 3
Augie Fackler <augie@google.com>
parents:
35098
diff
changeset
|
44 tryparse(t.replace(b'size', b'size-bytes').replace(b'oid', b'object-id')) |