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: 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 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: [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 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: [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

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

[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] 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: [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.

[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 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

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: [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: 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: [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 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: [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: [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 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: 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 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

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 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

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: [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: [PATCH 1/2] git-p4: support multiple depot paths in p4 submit

On 8 December 2015 at 11:41, Sam Hocevar wrote: > On Tue, Dec 08, 2015, Lars Schneider wrote: > >> > Would a refactor of lib-git-p4.sh (and probably all git-p4 tests) to >> > support multiple depots be acceptable and/or welcome? I prefer to ask >> > before I dig into the task.

Re: [PATCH v2] git-p4: Add option to keep empty commits

On 8 December 2015 at 09:36, wrote: > From: Lars Schneider > > A changelist that contains only excluded files due to a client spec was > imported as an empty commit. Fix that issue by ignoring these commits. > Add option

[PATCH 1/2] git-p4: failing test case for skipping changes with multiple depots

James Farwell reported that with multiple depots git-p4 would skip changes. http://article.gmane.org/gmane.comp.version-control.git/282297 Add a failing test case demonstrating the problem. Signed-off-by: Luke Diamand <l...@diamand.org> --- t/t9818-git-p4-block.s

[PATCH 2/2] git-p4: fix handling of multiple depot paths

es Farwell <jfarw...@vmware.com> Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 8 +--- t/t9818-git-p4-block.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/git-p4.py b/git-p4.py index 7a9dd6a..a8b5278 100755 --- a/git-p4.py +++

[PATCH 0/2] git-p4: fix for handling of multiple depot paths

James Farwell reported a bug I introduced into git-p4 with handling of multiple depot paths: http://article.gmane.org/gmane.comp.version-control.git/282297 This patch series adds a failing test case, and a fix for this problem. Luke Luke Diamand (2): git-p4: failing test case for skipping

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

Having just fixed this, I've now just spotted that Sam Hocevar's fix to reduce the number of P4 transactions also fixes it: https://www.mail-archive.com/git%40vger.kernel.org/msg81880.html That seems like a cleaner fix. Luke On 13 December 2015 at 20:07, Luke Diamand <l...@diamand.org>

Re: Bug: git-p4 can skip changes when syncing large from multiple depot paths

On 12 December 2015 at 02:52, James Farwell wrote: > > Reproduction Steps: > > 1. Have a git repo cloned from a perforce repo using multiple depot paths > (e.g. //depot/foo/ and //depot/bar/). > 2. Add changes to the perforce repo in both depot paths. (e.g. 5 changes in >

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

On 14 December 2015 at 19:16, Junio C Hamano <gits...@pobox.com> wrote: > Luke Diamand <l...@diamand.org> writes: > >> Having just fixed this, I've now just spotted that Sam Hocevar's fix >> to reduce the number of P4 transactions also fixes it: >>

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

be fine, but it needs to be thought about a bit. Sam - do you have any thoughts on this? Thanks Luke On 14 December 2015 at 22:06, Junio C Hamano <gits...@pobox.com> wrote: > Luke Diamand <l...@diamand.org> writes: > >> On 14 December 2015 at 19:16, Junio C Hamano &

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

On 16/12/15 00:38, Sam Hocevar wrote: I'm actually surprised that the patch changes the order at all, since all it does is affect the decision (on a yes/no basis) to include a given file into a changelist. I'm going to have a look at that specific unit test, but of course as a user I'd prefer if

Re: [PATCH v2] git-p4.py: add support for filetype change

On 4 January 2016 at 10:52, Romain Picard wrote: > After changing the type of a file in the git repository, it is not possible to > "git p4 publish" the commit to perforce. This is due to the fact that the git > "T" status is not handled in git-p4.py. This can typically

Re: [PATCH] git-p4.py: add support for filetype change

On 21 December 2015 at 13:09, Romain Picard wrote: > After changing the type of a file in the git repository, it is not possible to > "git p4 publish" the commit to perforce. This is due to the fact that the git > "T" status is not handled in git-p4.py. This can

Re: [PATCH v1 2/2] git-p4: suppress non test relevant output

On 22/12/15 08:47, Lars Schneider wrote: On 21 Dec 2015, at 21:38, Junio C Hamano wrote: If so, why not do it there instead? You seem to run only "kill" to send some signal to a process using this helper function, and it would be silent on its standard output stream

[PATCHv2 2/3] git-p4: support multiple depot paths in p4 submit

ed-off-by: Sam Hocevar <s...@hocevar.net> Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index 7a9dd6a..122aff2 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1458,6 +1458,8

[PATCHv2 0/3] git-p4: fixing p4ChangesForPaths

' problem. This followup just fixes Sam's original fix to restore the behavior of p4ChangesForPaths() so that it returns a sorted list of changes. That fixes a failing a testcase. Luke Diamand (1): git-p4: failing test case for skipping changes with multiple depots Sam Hocevar (2): git-p4

[PATCHv2 1/3] git-p4: failing test case for skipping changes with multiple depots

James Farwell reported that with multiple depots git-p4 would skip changes. http://article.gmane.org/gmane.comp.version-control.git/282297 Add a failing test case demonstrating the problem. Signed-off-by: Luke Diamand <l...@diamand.org> --- t/t9818-git-p4-block.s

[PATCHv2 3/3] git-p4: reduce number of server queries for fetches

esults and remove duplicates. Signed-off-by: Sam Hocevar <s...@hocevar.net> Signed-off-by: Luke Diamand <l...@diamand.org> --- git-p4.py | 44 +--- t/t9818-git-p4-block.sh | 2 +- 2 files changed, 22 insertions(+), 24 deletions(-) d

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: 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] git-p4.py: Make submit working on bare repository

On 23 February 2016 at 06:59, Junio C Hamano wrote: > Amadeusz Żołnowski writes: > >> Junio C Hamano writes: >>> I wonder if it makes sense to just silently allowing submit without >>> rebasing, and without telling the user how to

Re: [PATCH] git-p4.py: Make submit working on bare repository

On 23 February 2016 at 20:56, Amadeusz Żołnowski wrote: > > To simplify things, why not just update ref during submit from bare > repository? As you have pointed out, if user invokes submit in this > context he/she actually wants to submit from bare repo and probably > knows

Re: [PATCH v1] git-p4: map a P4 user to Git author name and email address

On 28 February 2016 at 10:25, wrote: > From: Lars Schneider > > Map a P4 user to a specific name and email address in Git with the > "git-p4.mapUser" config. The config value must be a string adhering > to the format "p4user -> First

Re: [PATCH] git-p4.py: Make submit working on bare repository

On 28 February 2016 at 20:46, Amadeusz Żołnowski wrote: > > True. For now I have these cases covered by wrapper scripts. The minimum > I need from git-p4 is just not to fail on git submit from bare > repository which is covered by patch I have submitted. If I get my >

Re: [PATCH] git-p4.py: Don't try to rebase on submit from bare repository

On 17 February 2016 at 22:46, Amadeusz Żołnowski wrote: > git-p4 can be successfully used from bare repository (which acts as a > bridge between Perforce repository and pure Git repositories). On submit > git-p4 performs unconditional rebase. Do rebase only on non-bare >

Re: [PATCH v2] git-p4: map a P4 user to Git author name and email address

On 13 March 2016 at 17:41, Lars Schneider <larsxschnei...@gmail.com> wrote: > > On 02 Mar 2016, at 10:25, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> >>> On 02 Mar 2016, at 06:06, Luke Diamand <l...@diamand.org> wrote: >>>

Re: [PATCH v1] git-p4: fix AsciiDoc formatting

On 14 March 2016 at 03:51, Junio C Hamano wrote: > Lars Schneider writes: > >>> diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt >>> index 738cfde..140fc12 100644 >>> --- a/Documentation/git-p4.txt >>> +++ b/Documentation/git-p4.txt

Re: [PATCH v2] git-p4: map a P4 user to Git author name and email address

Yes please. On 15 March 2016 at 16:52, Junio C Hamano <gits...@pobox.com> wrote: > Luke Diamand <l...@diamand.org> writes: > >>> Is the patch uninteresting for git-p4 as it handles only an occasional >>> exception or did the patch get lost in the noise?

Re: [PATCH v2] git-p4: map a P4 user to Git author name and email address

On 1 March 2016 at 19:15, Eric Sunshine wrote: > On Tue, Mar 1, 2016 at 5:49 AM, wrote: >> Map a P4 user to a specific name and email address in Git with the >> "git-p4.mapUser" config. The config value must be a string adhering >> to the

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

On 20 April 2016 at 19:28, Ben Woosley wrote: > From: Ben Woosley > > The git lfs pointer output was changed in: > https://github.com/github/git-lfs/pull/1105 > > This was causing Mac Travis runs to fail, as homebrew had updated to 1.2 > while Linux

Re: [PATCHv1] git-p4: workaround p4 removal of client directory

Adding correct email for Jacob. On 29 April 2016 at 08:40, Luke Diamand <l...@diamand.org> wrote: > On some platforms, "p4 sync -f" will remove the workspace > directory after we have just created it; on some it won't. > This causes problems later when git finds itself i

[PATCHv1] git-p4: workaround p4 removal of client directory

On some platforms, "p4 sync -f" will remove the workspace directory after we have just created it; on some it won't. This causes problems later when git finds itself in an orphaned directory. Workaround this by cd'ing back to the directory after the "p4 sync -f". Signed-off

[PATCHv1] git-p4: workaround p4 removal of client directory

This is a proposed fix for the problem reported by Jacob on OSX where "p4 sync -f" removes the client directory. http://www.spinics.net/lists/git/msg274356.html I tried just moving the "cd", but lots of the tests then fail as the "p4 sync" needs to be in the corre

<    1   2   3   4   >