[PATCH] p4: Retrieve the right revision of the UTF-16 file

Fixing bug with UTF-16 files when they are retreived by git-p4. It was always getting the tip version of the file and the history of the file was lost. --- git-p4.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index cdfa2df..be2c7da 100755 ---

[PATCH] p4: Retrieve the right revision of the UTF-16 file

Fixing bug with UTF-16 files when they are retrieved by git-p4. It was always getting the tip version of the file and the history of the file was lost. Signed-off-by: Miguel Torroja miguel.torr...@gmail.com --- git-p4.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git

[PATCH 1/2] fast-export: deletion action first

changes). That change was made in order to fix the case of directory to file in the same commit, but it broke the reverse case (File to directory). Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 25 + 1 file changed, 9 insertions(

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builti

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builti

[PATCH 1/2] fast-export: deletion action first

changes). That change was made in order to fix the case of directory to file in the same commit, but it broke the reverse case (File to directory). Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 25 + 1 file changed, 9 insertions(

[PATCH 1/2] fast-export: deletion action first

changes). That change was made in order to fix the case of directory to file in the same commit, but it broke the reverse case (File to directory). Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 25 + 1 file changed, 9 insertions(

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builti

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

lt behaviour , when calling modfyChangelistUser, it is waiting for any message with 'data' that is not an error to consider command was succesful Thanks, On Wed, Jul 12, 2017 at 10:25 AM, Luke Diamand <l...@diamand.org> wrote: > On 11 July 2017 at 23:53, Miguel Torroja <miguel.torr...@g

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

I'm sending another patch update On Tue, Jul 11, 2017 at 10:35 AM, Luke Diamand <l...@diamand.org> wrote: > On 3 July 2017 at 23:57, Miguel Torroja <miguel.torr...@gmail.com> wrote: >> The option -G of p4 (python marshal output) gives more context about the >> data

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

p4CmdList (this time default is reversed and set to False, what is the original behaviour). The two test cases that are cured with this change have to set explicitely skip_info=True. On Wed, Jul 12, 2017 at 7:13 PM, Junio C Hamano <gits...@pobox.com> wrote: > Miguel Torroja <miguel.tor

[PATCH 1/3] git-p4: git-p4 tests with p4 triggers

-by: Miguel Torroja <miguel.torr...@gmail.com> --- t/t9831-git-p4-triggers.sh | 103 + 1 file changed, 103 insertions(+) create mode 100755 t/t9831-git-p4-triggers.sh diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh new fil

[PATCH 3/3] git-p4: filter for {'code':'info'} in p4CmdList

The function p4CmdList accepts a new argument: skip_info. When set to True it ignores any 'code':'info' entry (skip_info=False by default). That allows us to fix some of the tests in t9831-git-p4-triggers.sh known to be broken with verobse p4 triggers Signed-off-by: Miguel Torroja <miguel.t

[PATCH 2/3] git-p4: parse marshal output "p4 -G" in p4 changes

set and the command git-p4 submit is run. Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- git-p4.py | 85 +++--- t/t9831-git-p4-triggers.sh | 2 +- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/g

[PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

t to True it ignores any 'code':'info' entry (skip_info=True by default). A new test has been created in t9807-git-p4-submit.sh adding a p4 trigger that outputs extra lines with "p4 change -o" and "p4 changes" Signed-off-by: Miguel Torroja <miguel.torr...@gm

[PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

trigger that outputs extra lines with "p4 change -o" and "p4 changes" Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- git-p4.py| 85 t/

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

On Thu, Jun 29, 2017 at 8:59 AM, Luke Diamand <l...@diamand.org> wrote: > On 28 June 2017 at 14:14, miguel torroja <miguel.torr...@gmail.com> wrote: >> Thanks Luke, >> >> regarding the error in t9800 (not ok 18 - unresolvable host in P4PORT >> should dis

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

The Latest patch I sent was already the squashed version with the fix to pass the tests. Thanks, On Fri, Jun 30, 2017 at 9:56 AM, Luke Diamand <l...@diamand.org> wrote: > On 29 June 2017 at 23:41, miguel torroja <miguel.torr...@gmail.com> wrote: >> On Thu, Jun 29, 2017 at

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

On Fri, Jun 30, 2017 at 10:26 AM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 30 Jun 2017, at 00:46, miguel torroja <miguel.torr...@gmail.com> wrote: >> >> The option -G of p4 (python marshal output) gives more context about the >> data

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

On Fri, Jun 30, 2017 at 12:13 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 30 Jun 2017, at 11:41, Miguel Torroja <miguel.torr...@gmail.com> wrote: >> >> On Fri, Jun 30, 2017 at 10:26 AM, Lars Schneider >> <larsxschnei...@gmail.com> wro

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

suggestion), On Fri, Jun 30, 2017 at 6:02 PM, Miguel Torroja <miguel.torr...@gmail.com> wrote: > On Fri, Jun 30, 2017 at 12:13 PM, Lars Schneider > <larsxschnei...@gmail.com> wrote: >> >>> On 30 Jun 2017, at 11:41, Miguel Torroja <miguel.torr...@gmail.com> wrote: &

[PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

t to True it ignores any 'code':'info' entry (skip_info=True by default). A new test has been created to t9807-git-p4-submit.sh adding a p4 trigger that outputs extra lines with "p4 change -o" and "p4 changes" Signed-off-by: Miguel Torroja <miguel.torr...@gm

[PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

trigger that outputs extra lines with "p4 change -o" and "p4 changes" Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- git-p4.py| 83 t/t9807-git-p4-submit.sh | 28 2 files ch

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

mand.org> wrote: > On 28 June 2017 at 05:08, Junio C Hamano <gits...@pobox.com> wrote: >> Miguel Torroja <miguel.torr...@gmail.com> writes: >> >>> The option -G of p4 (python marshal output) gives more context about the >>> data being output. That'

[PATCH] git-p4: changelist template with p4 -G change -o

n executed. Unfortunately those messages are mixed with the output of "p4 change -o". Those extra warning lines are reported as {'code':'info'} in python marshal output (-G). The real change output is reported as {'code':'stat'} Signed-off-by: Miguel Torroja <miguel.torr...@gmail.c

Re: [PATCH] git-p4: changelist template with p4 -G change -o

June 2017 at 18:32, Junio C Hamano <gits...@pobox.com> wrote: >> Miguel Torroja <miguel.torr...@gmail.com> writes: >> >>> The option -G of p4 (python marshal output) gives more context about the >>> data being output. That's useful when using the command &qu

Re: [PATCH] git-p4: changelist template with p4 -G change -o

anges and the new test. Thanks, Miguel On Sat, Jun 24, 2017 at 10:37 PM, miguel torroja <miguel.torr...@gmail.com> wrote: > Hi Lars, > > I think it's doable to set a custom p4 trigger, created by the test case, > that outputs "extra info" when requesting a changeli

Re: [PATCH] fast-export: deletion action first

en I first sent the patch. The behavior for the other corner cases pointed out by Jeff (delete/rename dir/file ) are not tackled in this patch and the final result is unknown. On Thu, May 4, 2017 at 9:36 PM, Miguel Torroja <miguel.torr...@gmail.com> wrote: > > The delete operations of

[PATCH] fast-export: deletion action first

(File to directory). The test "file becomes directory" has been added in order to exercise the original motivation of the deletion reorder. Signed-off-by: Miguel Torroja <miguel.torr...@gmail.com> --- builtin/fast-export.c | 32 +++- t/t9350-fas

Re: [PATCH 1/1] git-p4: add unshelve command

Hi Luke, I really like the idea of creating a branch based on a shelved CL (We particularly use shelves all the time), I tested your change and I have some comments. - I have some concerns about having the same "[git-p4...change = .]" as if it were a real submitted CL. One use case I

Re: [PATCH 1/1] git-p4: add unshelve command

On Fri, Feb 23, 2018 at 6:22 PM, Luke Diamand <l...@diamand.org> wrote: > On 22 February 2018 at 22:28, Luke Diamand <l...@diamand.org> wrote: >> On 22 February 2018 at 21:39, Miguel Torroja <miguel.torr...@gmail.com> >> wrote: >>> Hi Luke, >>&

Re: [PATCH 1/1] git-p4: add format-patch subcommand

very nice subcommand, I tested it with a shelved CL and a submitted CL. Find my comments inline On Mon, Feb 26, 2018 at 12:48 PM, Luke Diamand wrote: > It takes a list of P4 changelists and generates a patch for > each one, using "p4 describe". > > This is especially useful for