Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-20 Thread Matthieu Moy
Karthik Nayak writes: > On Mon, Sep 21, 2015 at 12:30 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> --- a/t/t3203-branch-output.sh >>> +++ b/t/t3203-branch-output.sh >>> @@ -145,8 +145,8 @@ EOF >>> >>> test_expect_success 'git branch `--sort` option' ' >>> cat >expect <<-\EOF

Personal Email Directed To You.

2015-09-20 Thread wang_guiya13
I am Wang Guiya From Hong Kong. I have an important message for you(Business from My Bank) which is goin to benefit you and I a lot, but I want to be sure if you still use this email address before I pass the message across to you, I will be glad to read from you Now.Regards. -- To unsubscrib

Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-20 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 12:30 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> --- a/t/t3203-branch-output.sh >> +++ b/t/t3203-branch-output.sh >> @@ -145,8 +145,8 @@ EOF >> >> test_expect_success 'git branch `--sort` option' ' >> cat >expect <<-\EOF && >> - * (HEAD detached from f

допоможіть нашому сайту http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

2015-09-20 Thread admin
Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли заплат

Re: [PATCH 66/67] use strbuf_complete to conditionally append slash

2015-09-20 Thread Eric Sunshine
On Tue, Sep 15, 2015 at 12:16 PM, Jeff King wrote: > When working with paths in strbufs, we frequently want to > ensure that a directory contains a trailing slash before > appending to it. We can shorten this code (and make the > intent more obvious) by calling strbuf_complete. > > Most of these c

Re: [PATCH 56/67] avoid sprintf and strcpy with flex arrays

2015-09-20 Thread Eric Sunshine
On Tue, Sep 15, 2015 at 12:09 PM, Jeff King wrote: > When we are allocating a struct with a FLEX_ARRAY member, we > generally compute the size of the array and then sprintf or > strcpy into it. Normally we could improve a dynamic allocation > like this by using xstrfmt, but it doesn't work here; w

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

2015-09-20 Thread Eric Sunshine
On Sun, Sep 20, 2015 at 5:34 PM, Lars Schneider wrote: > On 20 Sep 2015, at 23:16, Eric Sunshine wrote: >> On Sun, Sep 20, 2015 at 12:22 PM, wrote: >>> 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 >>> atte

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

2015-09-20 Thread Lars Schneider
On 20 Sep 2015, at 23:16, Eric Sunshine wrote: > On Sun, Sep 20, 2015 at 12:22 PM, wrote: >> 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 >> attempts to retrieve the file then the process crashes with a >>

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

2015-09-20 Thread Lars Schneider
On 16 Sep 2015, at 17:20, Junio C Hamano wrote: > Lars Schneider writes: > +git-p4.largeFileSystem:: + Specify the system that is used for large (binary) files. Please note + that large file systems do not support the 'git p4 submit' command. >>> >>> Why is that? Is it just t

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

2015-09-20 Thread Eric Sunshine
On Sun, Sep 20, 2015 at 12:22 PM, wrote: > 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 > attempts to retrieve the file then the process crashes with a > "Translation of file content failed" error. Hmm, are t

[PATCH v6 4/7] git-p4: add file streaming progress in verbose mode

2015-09-20 Thread larsxschneider
From: Lars Schneider If a file is streamed from P4 to Git then the verbose mode prints continuously the progress as percentage like this: //depot/file.bin 20% (10 MB) Upon completion the progress is overwritten with depot source, local file and size like this: //depot/file.bin --> local/file.bin

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

2015-09-20 Thread larsxschneider
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 [3], git-annex [4] try to address this problem. Add a generic mechanism to dete

[PATCH v6 5/7] git-p4: check free space during streaming

2015-09-20 Thread larsxschneider
From: Lars Schneider git-p4 will just halt if there is not enough disk space while streaming content from P4 to Git. Add a check to ensure at least 4 times (arbitrarily chosen) the size of a streamed file is available. Signed-off-by: Lars Schneider --- git-p4.py | 27 ++

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

2015-09-20 Thread larsxschneider
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 implement “gitConfigBool. This prepares the implementation of other type specifiers su

[PATCH v6 3/7] git-p4: return an empty list if a list config has no values

2015-09-20 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index 40ad4ae..90d3b90 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def gitConfigList(key): if not _gitConfig.has_key(key): s

[PATCH v6 7/7] git-p4: add Git LFS backend for large file system

2015-09-20 Thread larsxschneider
From: Lars Schneider Add example implementation including test cases for the large file system using Git LFS. Pushing files to the Git LFS server is not tested. Signed-off-by: Lars Schneider --- git-p4.py | 72 t/t9824-git-p4-git-lfs.sh | 288

[PATCH v6 2/7] git-p4: add gitConfigInt reader

2015-09-20 Thread larsxschneider
From: Lars Schneider Add a git config reader for integer variables. Please note that the git config implementation automatically supports k, m, and g suffixes. Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/git-p4.py b/git-p4.py in

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

2015-09-20 Thread larsxschneider
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 LFS test case for git-p4.largeFileExtensions option * add Luke's ACK to commit

Re: [PATCH v5 7/8] branch.c: use 'ref-filter' APIs

2015-09-20 Thread Matthieu Moy
Karthik Nayak writes: > --- a/Documentation/git-branch.txt > +++ b/Documentation/git-branch.txt > @@ -231,6 +231,13 @@ start-point is either a local or remote-tracking branch. > The new name for an existing branch. The same restrictions as for >apply. > > +--sort=:: > + Sort b

Re: [PATCH v5 5/8] branch: drop non-commit error reporting

2015-09-20 Thread Matthieu Moy
Karthik Nayak writes: > Remove the error reporting variable to make the code easier to port > over to using ref-filter APIs. This variable (it's not just a variable, it's also a message on the output) > is not required as in ref-filter we already check for possible errors > and report them. Yo

Re: [PATCH v5 3/8] branch: roll show_detached HEAD into regular ref_list

2015-09-20 Thread Matthieu Moy
Karthik Nayak writes: > @@ -681,14 +684,12 @@ static int print_ref_list(int kinds, int detached, int > verbose, int abbrev, stru > > qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); > > - detached = (detached && (kinds & REF_LOCAL_BRANCH)); > - if (detach

Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-20 Thread Matthieu Moy
Karthik Nayak writes: > --- a/t/t3203-branch-output.sh > +++ b/t/t3203-branch-output.sh > @@ -145,8 +145,8 @@ EOF > > test_expect_success 'git branch `--sort` option' ' > cat >expect <<-\EOF && > - * (HEAD detached from fromtag) > branch-two > + * (HEAD detached from from

[PATCH v5 8/8] branch: add '--points-at' option

2015-09-20 Thread Karthik Nayak
Add the '--points-at' option provided by 'ref-filter'. The option lets the user to list only branches which points at the given object. Add documentation and tests for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- Documentation/git-branch.t

[PATCH v5 3/8] branch: roll show_detached HEAD into regular ref_list

2015-09-20 Thread Karthik Nayak
Remove show_detached() and make detached HEAD to be rolled into regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and supporting the same in append_ref(). This eliminates the need for an extra function and helps in easier porting of branch.c to use ref-filter APIs. Before show_detac

[PATCH v5 4/8] branch: move 'current' check down to the presentation layer

2015-09-20 Thread Karthik Nayak
We check if given ref is the current branch in print_ref_list(). Move this check to print_ref_item() where it is checked right before printing. This enables a smooth transition to using ref-filter APIs, as we can later replace the current check while printing to just check for FILTER_REFS_DETACHED

[PATCH v5 6/8] branch.c: use 'ref-filter' data structures

2015-09-20 Thread Karthik Nayak
Make 'branch.c' use 'ref-filter' data structures and make changes to support the new data structures. This is a part of the process of porting 'branch.c' to use 'ref-filter' APIs. This is a temporary step before porting 'branch.c' to use 'ref-filter' completely. As this is a temporary step, most o

[PATCH v5 7/8] branch.c: use 'ref-filter' APIs

2015-09-20 Thread Karthik Nayak
Make 'branch.c' use 'ref-filter' APIs for iterating through refs sorting. This removes most of the code used in 'branch.c' replacing it with calls to the 'ref-filter' library. Make 'branch.c' use the 'filter_refs()' function provided by 'ref-filter' to filter out tags based on the options set. We

[PATCH v5 5/8] branch: drop non-commit error reporting

2015-09-20 Thread Karthik Nayak
Remove the error reporting variable to make the code easier to port over to using ref-filter APIs. This variable is not required as in ref-filter we already check for possible errors and report them. Based-on-patch-by: Jeff King Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off

[PATCH v5 1/8] branch: refactor width computation

2015-09-20 Thread Karthik Nayak
From: Karthik Nayak Remove unnecessary variables from ref_list and ref_item which were used for width computation. This is to make ref_item similar to ref-filter's ref_array_item. This will ensure a smooth port of branch.c to use ref-filter APIs in further patches. Previously the maxwidth was co

[PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-20 Thread Karthik Nayak
This is part of porting 'branch -l' to use ref-filter APIs The previous version of this series (v4) can be found here: thread.gmane.org/gmane.comp.version-control.git/277761 Changes in this version include: * Now we sort by 'refname' by default, this eliminates the need for attaching the detached

[PATCH v5 2/8] branch: bump get_head_description() to the top

2015-09-20 Thread Karthik Nayak
This is a preperatory patch for 'roll show_detached HEAD into regular ref_list'. This patch moves get_head_description() to the top so that it can be used in print_ref_item(). Based-on-patch-by: Jeff King Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak ---

Re: [GIT PULL] l10n updates for 2.6.0 round 2

2015-09-20 Thread Jiang Xin
Hi Junio, This pull request fixes typo of commit " l10n: fr.po v1.6.0 round 1 ..." (should replace 1.6.0 to 2.6.0), and also includes new updates from Ralf. I also create a signed tag (l10n-2.6.0-rnd2+de) for this. Would you please pull the following git l10n updates. The following changes sinc

Re: [GIT PULL] l10n updates for 2.6.0 round 2

2015-09-20 Thread Jiang Xin
2015-09-21 0:21 GMT+08:00 Jiang Xin : > Hi Junio, > > Would you please pull the following git l10n updates. > > The following changes since commit f4d9753a89bf04011c00e943d85211906e86a0f6: > > Update RelNotes to 2.6 to describe leftover bits since -rc2 > (2015-09-14 15:00:41 -0700) > > are availa

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

2015-09-20 Thread larsxschneider
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 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. More info here: http://answers.perforc

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

2015-09-20 Thread larsxschneider
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 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. More info here: http://answers.perforc

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

2015-09-20 Thread larsxschneider
From: Lars Schneider diff to v2: * remove Perl calls for printing characters (Thanks Torsten!) * remove whitespaces after ">" (Thanks Torsten!) * add test case to show that the fix is not working for non "--verbose" mode (Thanks Luke!) * add P4 knowledge base link with detailed error description

[GIT PULL] l10n updates for 2.6.0 round 2

2015-09-20 Thread Jiang Xin
Hi Junio, Would you please pull the following git l10n updates. The following changes since commit f4d9753a89bf04011c00e943d85211906e86a0f6: Update RelNotes to 2.6 to describe leftover bits since -rc2 (2015-09-14 15:00:41 -0700) are available in the git repository at: git://github.com/git-

Second email notice to you (€950,000.00 Euro)

2015-09-20 Thread Qatar Foundation
Sehr geehrte Empfänger, Sie haben gewählt, um zu empfangen (€ 950,000.00 Euro) als Charity-Spenden aus der Qatar Foundation. Somit, Sie sind verpflichtet, zurück antworten an die unten genannten Kontaktinformationen E-Mail Adresse für weitere Informationen. Mit freundlichen Grüßen, Herr Rashid

Re: Unable to create temporary file '/var/git/tmv3-target-overlay.git/shallow_Un8ZOR': Permission denied

2015-09-20 Thread Joakim Tjernlund
On Sat, 2015-09-19 at 09:13 +0200, Johannes Schindelin wrote: > Hi Duy, > > On 2015-09-19 04:21, Duy Nguyen wrote: > > On Thu, Sep 17, 2015 at 11:54 PM, Joakim Tjernlund > > wrote: > > > On Thu, 2015-09-17 at 20:18 +0700, Duy Nguyen wrote: > > > > On Mon, Sep 14, 2015 at 10:37 PM, Joakim Tjernlun