Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On 20/11/15 14:09, Jeff King wrote: What's cooking in git.git (Nov 2015, #03; Fri, 20) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

[PATCHv2] git-p4: clean up after p4 submit failure

ange description, and we should treat the "p4 submit" failure the same way. Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne <egir...@murex.com> Signed-off-by: Junio C Hamano <gits...@pobox.

[PATCHv2] git-p4: Handle p4 submit failure

This is a small reroll of Etienne's earlier patch to clean up the p4 repo on submit failure. The only difference is to fix the t9807- test. This test was trying to remove a file which had already been cleaned up as a result of this change. GIRARD Etienne (1): git-p4: clean up after p4 submit

Re: [PATCH v6 0/6] Add Travis CI support

On 19/11/15 08:58, larsxschnei...@gmail.com wrote: From: Lars Schneider diff to v5: * check if PID file still exists on P4D cleanup (thanks Luke) * fix space/tab formatting error * add sleep to timeout loops (thanks Luke) * replace 'date +%s' with platform independent

[PATCH v2 2/3] git-p4: add option to system() to return subshell status

Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[PATCH v2 1/3] git-p4: add failing test for submit from detached head

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <l...@diamand.org> --- t/t9800-git-p4-basic.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 9

[PATCH v2 3/3] git-p4: work with a detached head

and submit successfully. Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 23 --- t/t9800-git-p4-basic.sh | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/git-p4.py b/git-p4.py index 9d55f9c..0cfc866 100755 --- a/git-p4.py

[PATCH v2 0/2] git-p4: allow submission from detached head

I'm resending my reroll of my earlier patch to teach git-p4 about detached heads. It uses Junio's suggestion of calling "git symbolic-ref" to determine if we're on a detached head, rather than parsing text strings. Luke Diamand (3): git-p4: add failing test for submit from detached

Re: [PATCH v6 0/6] Add Travis CI support

On 20 November 2015 at 08:46, Lars Schneider wrote: > > On 19 Nov 2015, at 15:14, Jeff King wrote: > > >> >>> git-p4: retry kill/cleanup operations in tests with timeout >>> git-p4: add p4d timeout in tests >>> git-p4: add trap to kill p4d on test exit

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

>> >> Which other platforms are we talking about here? >> >> https://www.perforce.com/downloads/helix >> >> From there, you can get Solaris10, HP-UX, AIX and various flavours of BSD. >> Solaris supports "date +%s". > > The question about "date +%s" portability arose with a suggestion to > employ

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

While implementing it I thought more about it. P4D is only supported on platforms that support the date function. That means these tests will only run on platforms that support the date function. Consequently I wondered if this would justify the slightly more complicated code. However, if you

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

On 17/11/15 08:22, Lars Schneider wrote: On 16 Nov 2015, at 09:36, Luke Diamand <l...@diamand.org> wrote: On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider <larsxschnei...@gmail.com> In rare cases kill/cleanup operations in tests fail. Retry thes

Re: [PATCH v5 3/6] git-p4: retry kill/cleanup operations in tests with timeout

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider In rare cases kill/cleanup operations in tests fail. Retry these operations with a timeout to make the test less flaky. Should there be a sleep in that retry_until_success loop so that it

Re: [PATCH v5 4/6] git-p4: add p4d timeout in tests

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider In rare cases p4d seems to hang. This watchdog will kill the p4d process after 300s in any case. That means each individual git p4 test needs to finish before 300s or it will fail. Looks good to

Re: [PATCH v5 5/6] git-p4: add trap to kill p4d on test exit

On 15/11/15 13:08, larsxschnei...@gmail.com wrote: From: Lars Schneider Sometimes the "prove" test runner hangs on test exit because p4d is still running. Add a trap to always kill "p4d" on test exit. With this change, I've started seeing this when running the

[PATCH v2 1/3] git-p4: add failing test for submit from detached head

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <l...@diamand.org> --- t/t9800-git-p4-basic.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 9

[PATCH v2 3/3] git-p4: work with a detached head

and submit successfully. Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 23 --- t/t9800-git-p4-basic.sh | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/git-p4.py b/git-p4.py index 9d55f9c..0cfc866 100755 --- a/git-p4.py

[PATCH v2 2/3] git-p4: add option to system() to return subshell status

Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[PATCH v2 0/2] git-p4: allow submission from detached head

This is a reroll of my earlier patch to teach git-p4 about detached heads. It uses Junio's suggestion of calling "git symbolic-ref" to determine if we're on a detached head, rather than parsing text strings. Luke Diamand (3): git-p4: add failing test for submit from detached head g

Re: [PATCH] git-p4: Handle p4 submit failure

On 30/10/15 17:57, Junio C Hamano wrote: Etienne Girard writes: Yes, however if `p4 submit` fails the corresponding "Command failed" error message is displayed, and the p4 error message itself is displayed if any. Tthe script will also terminate successfully if

Re: [PATCHv1 2/2] git-p4: work with a detached head

On 28/10/15 17:44, Junio C Hamano wrote: Luke Diamand <l...@diamand.org> writes: On 9 September 2015 at 22:52, Junio C Hamano <gits...@pobox.com> wrote: Luke Diamand <l...@diamand.org> writes: ... def currentGitBranch(): return read_pipe("git name-rev HEA

Re: [PATCH v1] git-p4: Add option to ignore empty commits

On 24/10/15 19:08, Lars Schneider wrote: On 21 Oct 2015, at 08:32, Luke Diamand <l...@diamand.org> wrote: On 19/10/15 19:43, larsxschnei...@gmail.com wrote: From: Lars Schneider <larsxschnei...@gmail.com> This seems to be adding a new function in the middle of an exist

Re: [PATCH v1] git-p4: Add option to ignore empty commits

On 24/10/15 17:28, Lars Schneider wrote: Also I have this suspicion that those who do want to use client spec to get a narrowed view into the history would almost always want this "ignore empty" behaviour (I'd even say the current behaviour to leave empty commits by default is a bug). What

Re: [PATCH v1 0/2] git-p4: Fix tests on OS X

On 12/10/15 18:03, larsxschnei...@gmail.com wrote: From: Lars Schneider I extracted this patch series from "[PATCH v3 0/3] Add Travis CI support" as suggested by Junio. All seems sensible to me. Luke Thanks, Lars Lars Schneider (2): git-p4: Improve test

Re: [PATCH v1] git-p4: Add option to ignore empty commits

On 19/10/15 19:43, larsxschnei...@gmail.com wrote: From: Lars Schneider A changelist that contains only excluded files (e.g. via client spec or branch prefix) will be imported as empty commit. Add option "git-p4.ignoreEmptyCommits" to ignore these commits.

Re: Git-p4 fails with NameError with python 2.7.2

On 20 October 2015 at 11:34, Etienne Girard wrote: > Hello, > > Git-p4 fail when I try to rebase with the error: "NameError: global > name 'ctypes' is not defined". The error occurs when I use python > 2.7.2 that is installed by default on my company's computers (it

Re: [PATCH] git-p4: import the ctypes module

On 20/10/15 20:36, Junio C Hamano wrote: Dennis Kaarsemaker writes: I do not follow Python development, but does the above mean that with recent 2.x you can say ctypes without first saying "import ctypes"? It feels somewhat non-pythonesque that identifiers like this

Re: [PATCH v3 3/3] git-p4: Skip t9819 test case on case insensitive file systems

Looks good to me, Ack. On 11 October 2015 at 18:55, wrote: > From: Lars Schneider > > Windows and OS X file systems are case insensitive by default. > Consequently the "git-p4-case-folding" test case does not apply to > them. > >

Re: [PATCH v8 0/7] git-p4: add support for large file systems

On 26 September 2015 at 08:54, wrote: > From: Lars Schneider > > diff to v7: > * fix commit message line length (thanks Junio) > * fix sync command for large file system support (thanks Luke!) > * add test case for sync command > * rename

Re: [RFC/PATCH v1] Add Travis CI support

On 25 September 2015 at 08:27, Johannes Schindelin wrote: > Hi, > > On 2015-09-25 05:14, Dennis Kaarsemaker wrote: >> On do, 2015-09-24 at 17:41 -0700, Junio C Hamano wrote: >>> larsxschnei...@gmail.com writes: >>> >>> > My idea is that the owner of

Re: [PATCH v7 0/7] git-p4: add support for large file systems

On 25/09/15 09:35, Lars Schneider wrote: size: 3 flags: 0 What's going on? I believe this is correct. Git-LFS uses the clean/smudge filter to replace the LFS pointer with the actual file on checkout. Therefore you see the actual file! You can find details here:

Re: [PATCH v7 6/7] git-p4: add support for large file systems

One tiny comment, otherwise this looks good to me. Can we use test_path_is_missing in place of !test_path_is_file ? On 21 September 2015 at 23:41, wrote: > From: Lars Schneider > > Perforce repositories can contain large (binary) files.

Re: git-p4: t9819 failing

On 23 September 2015 at 13:28, Lars Schneider wrote: > >> Here's the last bit of the crash dump from git-p4 I get: >> >> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf >>self.streamP4FilesCb(entry) >> File "/home/ldiamand/git/git/git-p4",

Re: [PATCH v7 0/7] git-p4: add support for large file systems

On 23 September 2015 at 12:42, Lars Schneider <larsxschnei...@gmail.com> wrote: > > On 23 Sep 2015, at 13:25, Luke Diamand <l...@diamand.org> wrote: > >> Adding back git@vger.kernel.org, which I inadvertently dropped off the >> thread. >> >> O

Re: git-p4: t9819 failing

OK, slight correction there - it now doesn't crash getting the disk usage, but I think it still needs to be updated following the other changes to case-handling. Luke On 24 September 2015 at 08:45, Luke Diamand <l...@diamand.org> wrote: > On 23 September 2015 at 13:28, Lars

Re: [PATCH v7 0/7] git-p4: add support for large file systems

Adding back git@vger.kernel.org, which I inadvertently dropped off the thread. On 23 September 2015 at 12:22, Luke Diamand <l...@diamand.org> wrote: > On 23 September 2015 at 11:09, Lars Schneider <larsxschnei...@gmail.com> > wrote: >> >> On 23 Sep 2015, at 11:22,

Re: git-p4: t9819 failing

On 23 September 2015 at 11:27, Lars Schneider <larsxschnei...@gmail.com> wrote: > > On 23 Sep 2015, at 11:27, Luke Diamand <l...@diamand.org> wrote: > >> Lars, >> >> I just noticed that your change "git-p4: honor core.ignorecase when >> using P4 c

Re: [PATCH v7 0/7] git-p4: add support for large file systems

On 21 September 2015 at 23:41, wrote: > From: Lars Schneider > > diff to v6: > * fix spaces in .gitattributes for Git-LFS files (old "[:space:]", new > "[[:space:]]") > * generated patch on top of next (95c4325) to resolve merge conflicts

git-p4: t9819 failing

Lars, I just noticed that your change "git-p4: honor core.ignorecase when using P4 client specs" seems to break t9819. I suspect that the problem is just that t9819 needs to be updated to reflect your change - do you have any thoughts on that? Thanks! Luke -- To unsubscribe from this list: send

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

On 20/09/15 23:29, Eric Sunshine wrote: On Sun, Sep 20, 2015 at 5:34 PM, Lars Schneider wrote: What is the preferred way by the Git community? Combine patch and test in one commit or a patch commit followed by a test commit? I would prefer to have everything in one

git-p4: nicodeDecodeError in ./t9822-git-p4-path-encoding.sh

Lars, When I run t9822-git-p4-path-encoding.sh, the last test fails (it's supposed to pass) with the following backtrace. This is with 'next' at 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6. Any ideas as to what I'm doing wrong? Thanks, Luke Reinitialized existing Git repository in

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

On 20/09/15 17:22, larsxschnei...@gmail.com wrote: From: Lars Schneider When I run this, I get errors reported on the sed usage: t9824-git-p4-handle-utf16-without-bom.sh:25: error: sed -i is not portable: sed -i.bak "$ d" depot/file1,v &&

Re: git-p4: nicodeDecodeError in ./t9822-git-p4-path-encoding.sh

On 21/09/15 08:01, Luke Diamand wrote: Lars, When I run t9822-git-p4-path-encoding.sh, the last test fails (it's supposed to pass) with the following backtrace. This is with 'next' at 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6. Any ideas as to what I'm doing wrong? I think this is probably

Re: [PATCH v3] git-p4: use replacement character for non UTF-8 characters in paths

On 21/09/15 09:49, larsxschnei...@gmail.com wrote: From: Lars Schneider I broke a test in "[PATCH v2] git-p4: improve path encoding verbose output" on the next branch. This patch on top of next (3dd15c0) fixes the issue. Thanks to Luke for finding the issue! Looks

Re: [PATCH v6 0/7] git-p4: add support for large file systems

On 20/09/15 21:26, larsxschnei...@gmail.com wrote: From: Lars Schneider diff to v5: * remove superfluous flush call (thanks Luke!) * keep &&-chain intact in test cases (thanks Luke, Junio and Eric!) * add mock LFS test case for deleting files (thanks Luke!) * add mock

Re: [PATCH v5 6/7] git-p4: add support for large file systems

On 14/09/15 14:26, larsxschnei...@gmail.com wrote: From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as Git LFS [1], Git Fat [2], Git Media

Re: [PATCH v2 2/2] git-p4: handle "Translation of file content failed"

On 15/09/15 16:38, Lars Schneider wrote: On 15 Sep 2015, at 08:43, Luke Diamand <l...@diamand.org> wrote: Do we know the mechanism by which we end up in this state? Unfortunately no. I tried hard to reproduce the error with “conventional” methods. As you can see I ended up manipu

Re: [PATCH v2 2/2] git-p4: handle "Translation of file content failed"

On 14/09/15 17:55, larsxschnei...@gmail.com wrote: From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 Sorry - what's a BOM? I'm assuming it's not a Bill of

Re: [PATCH v5 1/7] git-p4: add optional type specifier to gitConfig reader

On 14/09/15 14:26, larsxschnei...@gmail.com wrote: From: Lars Schneider The functions “gitConfig” and “gitConfigBool” are almost identical. Make “gitConfig” more generic by adding an optional type specifier. Use the type specifier “—bool” with “gitConfig” to

Re: [PATCH v7] git-p4: improve path encoding verbose output

On 15/09/15 08:31, Luke Diamand wrote: On 14/09/15 18:10, larsxschnei...@gmail.com wrote: It would be better to query this once at startup. Otherwise we're potentially forking "git config" twice per file which on a large repo could become significant. Make it an instance variab

Re: [PATCH v7] git-p4: improve path encoding verbose output

On 14/09/15 18:10, larsxschnei...@gmail.com wrote: From: Lars Schneider If a path with non-ASCII characters is detected then print always the s/print always/print/ encoding and the encoded string in verbose mode. Signed-off-by: Lars Schneider

Re: [PATCHv1 2/2] git-p4: work with a detached head

On 9 September 2015 at 22:52, Junio C Hamano <gits...@pobox.com> wrote: > Luke Diamand <l...@diamand.org> writes: > >> def run(self, args): >> if len(args) == 0: >> self.master = currentGitBranch() >> -if len(self

Re: [PATCHv1 0/2] git-p4: work on a detached head

On 10 September 2015 at 02:59, Jacob Keller wrote: > On Wed, Sep 9, 2015 at 6:57 PM, Jacob Keller wrote: >> On Wed, Sep 9, 2015 at 5:03 AM, Lars Schneider >> wrote: >>> I wanted to play with the patch and apply it to my

Re: [PATCH v3 0/5] git-p4: add support for large file systems

On 7 September 2015 at 13:21, wrote: > From: Lars Schneider > > One thing I don't like about the current implementation is that I don't see a > way to test the "git-p4.pushLargeFiles" config. I could start a git lfs server > locally but that

[PATCHv1 2/2] git-p4: work with a detached head

and submit successfully. Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 18 -- t/t9800-git-p4-basic.sh | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/git-p4.py b/git-p4.py index 2677c89..a22ae01 100755 --- a/git-p4.py

[PATCHv1 0/2] git-p4: work on a detached head

it for the last few days. Luke Diamand (2): git-p4: add failing test for submit from detached head git-p4: work with a detached head git-p4.py | 18 -- t/t9800-git-p4-basic.sh | 16 2 files changed, 28 insertions(+), 6 deletions(-) -- 2.6.0.rc0.133

[PATCHv1 1/2] git-p4: add failing test for submit from detached head

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <l...@diamand.org> --- t/t9800-git-p4-basic.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 9

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider I think this commit may need some explanation! Signed-off-by: Lars Schneider --- git-p4.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)

Re: [PATCH v2 4/4] git-p4: add support for large file systems

On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as LFS [1] or git-annex [2] try to

Re: [PATCH v2 2/4] git-p4: add gitConfigInt reader

On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider Explanation? Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/git-p4.py b/git-p4.py index

Re: [PATCH v2 2/4] git-p4: add gitConfigInt reader

On 03/09/15 21:17, Lars Schneider wrote: On 03 Sep 2015, at 21:57, Luke Diamand <l...@diamand.org> wrote: On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider <larsxschnei...@gmail.com> Explanation? Add a git config reader for integer variables.

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

>>> >>> Regarding Python 3: >>> Would you drop Python 2 support or do you want to support Python 2/3 in >>> parallel? I would prefer the former… >> >> For quite some time we would need to support both; we can't just have >> a release of git that one day breaks git-p4 for people stuck on Python >>

Re: [PATCH v5] git-p4: add config git-p4.pathEncoding

On 2 September 2015 at 21:39, wrote: > From: Lars Schneider > > Perforce keeps the encoding of a path as given by the originating OS. > Git expects paths encoded as UTF-8. Add a config to tell git-p4 what > encoding Perforce had used for the

Re: [PATCH] INSTALL: Add docs on how to use custom Python paths.

On 31 August 2015 at 14:22, Ehsan Akhgari wrote: > Signed-off-by: Ehsan Akhgari > --- > INSTALL | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/INSTALL b/INSTALL > index ffb071e..5b7fe91 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -148,6

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

Comments below. diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 82aa5d6..a188840 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -252,6 +252,18 @@ Git repository: Use a client spec to find the list of interesting files in p4.

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

On 28 August 2015 at 13:24, larsxschnei...@gmail.com wrote: From: Lars Schneider larsxschnei...@gmail.com I am migrating huge Perforce repositories including history to Git. Some of them contain large files that would blow up the resulting Git repositories. This patch adds an option to

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

On 30 August 2015 at 11:18, Lars Schneider larsxschnei...@gmail.com wrote: Thanks for your feedback! I like the “handle big files” plugin kind of idea. However, I wonder if it makes sense to put more and more stuff into git-p4.py (3000 LOC already). What do you think about splitting git-p4

[PATCHv1 3/3] git-p4: fix P4 label import for unprocessed commits

. Teach git-p4 to use fast-import marks when creating tags which reference commits created during the current run of the program. Commits created before the current run are still referenced in the old way using a normal git commit. Signed-off-by: Luke Diamand l...@diamand.org --- git-p4.py

[PATCHv1 1/3] git-p4: failing test for ignoring invalid p4 labels

-by: Luke Diamand l...@diamand.org --- t/t9811-git-p4-label-import.sh | 45 ++ 1 file changed, 45 insertions(+) diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 095238f..f7d5048 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t

[PATCHv1 2/3] git-p4: do not terminate creating tag for unknown commit

If p4 reports a tag for a commit that git-p4 does not know about (e.g. because it references a P4 changelist that was imported prior to the point at which the repo was cloned into git), make sure that the error is correctly caught and handled. rather than just crashing. Signed-off-by: Luke

[PATCHv1 0/3] git-p4: fixing import with labels when commit is not transferred

imported during this run of the program (and so won't have marks). A test case is added to demonstrate the problem. Marcus - if you're able to take a look at this and see if it fixes your problem that would be very useful. Thanks, Luke Luke Diamand (3): git-p4: failing test for ignoring invalid p4

Re: [PATCH v5] git-p4: Obey core.ignorecase when using P4 client specs.

On 25 August 2015 at 19:24, Luke Diamand l...@diamand.org wrote: On 25/08/15 14:14, Lars Schneider wrote: So the choices are: 1. A new command-line option which would silently set core.ignorecase 2. Users just have to know to set core.ignorecase manually before using git-p4 (i.e. Lars

Re: [PATCH v5] git-p4: Obey core.ignorecase when using P4 client specs.

On 24/08/15 22:30, larsxschnei...@gmail.com wrote: From: Lars Schneider larsxschnei...@gmail.com Thanks to Luke Diamand I realized the core problem and propose here a substiantially simpler fix to my PATCH v4. The test cases remain and prove the problem. In particular 8 - Clone path

Re: [PATCH v5] git-p4: Obey core.ignorecase when using P4 client specs.

On 25/08/15 14:14, Lars Schneider wrote: So the choices are: 1. A new command-line option which would silently set core.ignorecase 2. Users just have to know to set core.ignorecase manually before using git-p4 (i.e. Lars' patch v5) 3. Fix fast-import to take a --casefold option (but that's a

Re: [PATCH v5] git-p4: Obey core.ignorecase when using P4 client specs.

On 25/08/15 11:30, larsxschnei...@gmail.com wrote: Unfortunately the command line option is not sufficient as the resulting paths are still messed up. I added the switch but it looks like as core.ignorecase does some additional magic on fast-import. You can see my changes here:

Re: [PATCH v4] git-p4: fix faulty paths for case insensitive systems

On 24 August 2015 at 13:43, Lars Schneider larsxschnei...@gmail.com wrote: https://github.com/luked99/quick-git-p4-case-folding-test As mentioned I realized that the problem occurs only if you use client specs. Can you take a look at this test case / run it?

Re: [PATCH v4] git-p4: fix faulty paths for case insensitive systems

On 24 August 2015 at 10:51, Lars Schneider larsxschnei...@gmail.com wrote: I'm still trying to fully understand what's going on here - can you point out where I've got it wrong below please! Your welcome + sure :) snip While I was working on the examples for this email reply I realized

Re: [PATCH v4] git-p4: fix faulty paths for case insensitive systems

Lars - thanks for persisting with this! I'm still trying to fully understand what's going on here - can you point out where I've got it wrong below please! The server is on Linux, and is case-sensitive. For whatever reason (probably people committing changes on Windows in the first place) we've

Re: [git-p4] import with labels fails when commit is not transferred

On 04/07/15 04:27, Luke Diamand wrote: Sorry for not replying earlier, and thanks for taking the time to investigate this! It's a pretty subtle corner case: I think a test case would be useful. I'm going to try to put something together, unless you beat me to it! (I think t9811-git-p4-label

Re: [PATCH] git-p4: fix faulty paths for case insensitive systems

On 02/08/15 16:15, larsxschnei...@gmail.com wrote: From: Lars Schneider larsxschnei...@gmail.com Hi, I want to propose this patch as it helped us to migrate a big source code base successfully from P4 to Git. I am sorry that I don't provide a test case, yet. Case sensitivity is a pretty

Re: [git-p4] import with labels fails when commit is not transferred

Sorry for not replying earlier, and thanks for taking the time to investigate this! It's a pretty subtle corner case: I think a test case would be useful. I'm going to try to put something together, unless you beat me to it! (I think t9811-git-p4-label-import.sh is the one that needs

Re: Dependency Management

On 23/06/15 19:49, Josh Hagins wrote: If neither git-submodule nor git-subtree is palatable to you, here are a couple of alternatives you might try: * https://github.com/ingydotnet/git-subrepo * https://github.com/tdd/git-stree You could also use Android's repo tool:

Re: BUG: checkout won't checkout?

On 18 June 2015 at 23:28, Junio C Hamano gits...@pobox.com wrote: Luke Diamand l...@diamand.org writes: This is probably user error, but I'm not sure what I'm doing wrong. I'm posting here in case anyone else gets the same thing I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today. I've

Re: BUG: checkout won't checkout?

On 18 June 2015 at 23:53, Junio C Hamano gits...@pobox.com wrote: Luke Diamand l...@diamand.org writes: $ git checkout upstream/master -- subtree $ git diff upstream/master -- subtree -- still lots of deltas Does this show _ONLY_ additions? Or does it include modifications and removals

BUG: checkout won't checkout?

This is probably user error, but I'm not sure what I'm doing wrong. I'm posting here in case anyone else gets the same thing I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today. I've somehow ended up with history skipping back in time, but git not prepared to let let me fix it, or something.

Re: BUG: checkout won't checkout?

The other thing about these files is that they were all deleted a few weeks ago and have now come back. On 18 June 2015 at 23:07, Luke Diamand l...@diamand.org wrote: This is probably user error, but I'm not sure what I'm doing wrong. I'm posting here in case anyone else gets the same thing

[PATCHv3 1/4] git-p4: additional testing of --changes-block-size

Add additional tests of some corner-cases of the --changes-block-size git-p4 parameter. Also reduce the number of p4 changes created during the tests, so that they complete faster. Signed-off-by: Luke Diamand l...@diamand.org Acked-by: Lex Spoon l...@lexspoon.org --- t/t9818-git-p4-block.sh

[PATCHv3 0/4] git-p4: fixing --changes-block-size handling

to find a range that works?) and then take the lowest revision supplied. But that's quite a bit more complex. Luke Diamand (4): git-p4: additional testing of --changes-block-size git-p4: test with limited p4 server results git-p4: add tests for non-numeric revision range git-p4: fixing

[PATCHv3 3/4] git-p4: add tests for non-numeric revision range

Test that git-p4 can handle a sync with a non-numeric revision range (e.g. a date). Signed-off-by: Luke Diamand l...@diamand.org --- t/t9800-git-p4-basic.sh | 38 ++ 1 file changed, 38 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4

[PATCHv3 4/4] git-p4: fixing --changes-block-size handling

reason (p4 print, p4 files, etc) and it's probably not possible to workaround this. In the real world, this is probably not usually a problem. Signed-off-by: Luke Diamand l...@diamand.org --- git-p4.py | 85 - t/t9818-git-p4-block.sh | 12

[PATCHv3 2/4] git-p4: test with limited p4 server results

to work around this. Signed-off-by: Luke Diamand l...@diamand.org Acked-by: Lex Spoon l...@lexspoon.org --- t/t9818-git-p4-block.sh | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh index 79765a4..aae1121

Re: format-patch and submodules

On 10/06/15 18:04, Christopher Dunn wrote: Sorry. I thought empty patches were made to work in other cases. 'git-p4' needs to skip these. Wrong mailing list then. Possibly the right mailing list - can you explain what you mean here w.r.t git-p4 please? Thanks! Luke On Tue, Jun 9,

Re: [PATCHv1 3/3] git-p4: fixing --changes-block-size handling

On 07/06/15 17:33, Lex Spoon wrote: The implementation looks fine, especially given the test cases that back it up. I am only curious why the block size is set to a default of None. To put it as contcretely as possible: is there any expected configuration where None would work but 500 would not?

Re: [PATCHv1 0/3] git-p4: fixing --changes-block-size support

On 07/06/15 17:01, Lex Spoon wrote: Great work. Thanks! I actually found the problem in my day job, so it was very handy having all the infrastructure already in place! For curiosity's sake, the -m solution has been observed to work on at least one Perforce installation. However clearly it

[PATCHv1 2/3] git-p4: test with limited p4 server results

to work around this. Signed-off-by: Luke Diamand l...@diamand.org --- t/t9818-git-p4-block.sh | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh index 79765a4..aae1121 100755 --- a/t/t9818-git-p4-block.sh

[PATCHv1 3/3] git-p4: fixing --changes-block-size handling

-by: Luke Diamand l...@diamand.org --- git-p4.py | 48 +++- t/t9818-git-p4-block.sh | 12 ++-- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/git-p4.py b/git-p4.py index 26ad4bc..0e29b75 100755 --- a/git-p4.py +++ b

[PATCHv1 1/3] git-p4: additional testing of --changes-block-size

Add additional tests of some corner-cases of the --changes-block-size git-p4 parameter. Also reduce the number of p4 changes created during the tests, so that they complete faster. Signed-off-by: Luke Diamand l...@diamand.org --- t/t9818-git-p4-block.sh | 56

[PATCHv1 0/3] git-p4: fixing --changes-block-size support

to be uncovered; I find the way that these limits interact somewhat tricky to understand. Thanks, Luke Luke Diamand (3): git-p4: additional testing of --changes-block-size git-p4: test with limited p4 server results git-p4: fixing --changes-block-size handling git-p4.py | 48

[PATCHv2 2/3] git-p4: test with limited p4 server results

to work around this. Signed-off-by: Luke Diamand l...@diamand.org Acked-by: Lex Spoon l...@lexspoon.org --- t/t9818-git-p4-block.sh | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh index 79765a4..aae1121

[PATCHv2 1/3] git-p4: additional testing of --changes-block-size

Add additional tests of some corner-cases of the --changes-block-size git-p4 parameter. Also reduce the number of p4 changes created during the tests, so that they complete faster. Signed-off-by: Luke Diamand l...@diamand.org Acked-by: Lex Spoon l...@lexspoon.org --- t/t9818-git-p4-block.sh

<    1   2   3   4   >