* Re: Pull request for sub-tree merge into /contrib/gitstats
From: Sverre Rabbelier @ 2008-10-29 23:39 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Junio C Hamano, Git Mailinglist
In-Reply-To: <20081029231251.GB31926@spearce.org>
On Thu, Oct 30, 2008 at 00:12, Shawn O. Pearce <spearce@spearce.org> wrote:
> Most stuff in contrib/ has its commit messages with a prefix string
> to make it more clear when looking at the shortlog what is being
> impacted. Maybe this should be re-written with filter-branch to
> include a prefix before it merges.
Sure, I'm fine with rewriting all commit messages to have a "gitstats:" prefix.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: jgit as a jira plugin
From: J. Longman @ 2008-10-29 23:49 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20081029230816.GA31926@spearce.org>
On 29-Oct-08, at 7:08 PM, Shawn O. Pearce wrote:
> "J. Longman" <longman@xiplink.com> wrote:
>> 2) I'd like to find out the jgit way to achieve the equivalent of
>> 'svn
>> update'. I understand that fetch can do this but being new to git, I
>> don't really understand quite what I need yet. The goal is to have
>> git
>> the latest commits from the origin before indexing.
> Use a Transport instance to execute a default fetch (no args) on say
> the "remote" origin. That will download the objects to the local
> database, but it won't update a working directory. But I'm not sure
> you would care about the working directory in the backend of Jira.
Basically I stole the pgm.Fetch code:
Transport tn = Transport.open(repository, "origin");
final FetchResult r;
List<RefSpec> toget = new ArrayList<RefSpec>();
try {
r = tn.fetch(new TextProgressMonitor(), toget);
} finally {
tn.close();
}
Can I assume that this enough to update the database? If so I think
I'm doing what you're suggesting. After this (and not shown) is some
logging code taken from Fetch, which results in the following:
From /Users/longman/workspace2/work/../masterRepo/
131dcf5..078d43f master -> origin/master
but there doesn't appear to be any specific mention of the incoming
changes.
>> Thanks for jgit - it took me a day or two to wrap my head around
>> getting
>> the list of files changed in a commit but otherwise its great to have
>> something that can be integrated into jira.
> Yea, about that, we wanted to write more tutorials on the API... ;-)
Well, the egit does provide some examples, just there's another API
involved which can be confusing. The code in the jira git plugin the
key classes are GitManagerImpl and RevisionIndexer, but the
RevisionIndexer has some Lucene (text search engine) API mixed-in.
Plus I'm still even learning about git much less the jgit api so I
can't vouch for quality or correctness ;-). I could snip some code
out and send it to you off-list for inclusion in the wiki maybe.
later, j
--
J. Longman
longman@xiplink.com
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. If you have received this in error, please contact the sender
and delete this communication and any copy immediately. Thank you.
^ permalink raw reply
* Re: jgit as a jira plugin
From: Shawn O. Pearce @ 2008-10-29 23:53 UTC (permalink / raw)
To: J. Longman; +Cc: git
In-Reply-To: <D7D18CE8-BDBD-430A-BCB6-D1BEFD21C949@xiplink.com>
"J. Longman" <longman@xiplink.com> wrote:
> Basically I stole the pgm.Fetch code:
>
> Transport tn = Transport.open(repository, "origin");
> final FetchResult r;
> List<RefSpec> toget = new ArrayList<RefSpec>();
> try {
> r = tn.fetch(new TextProgressMonitor(), toget);
> } finally {
> tn.close();
> }
>
> Can I assume that this enough to update the database?
Yes
> After this (and not shown) is some
> logging code taken from Fetch, which results in the following:
>
> From /Users/longman/workspace2/work/../masterRepo/
> 131dcf5..078d43f master -> origin/master
>
> but there doesn't appear to be any specific mention of the incoming
> changes.
Well, the new changes are what "git log 131dcf5..078d43f" outputs.
--
Shawn.
^ permalink raw reply
* [PATCH] git-filter-branch: Add an example on how to remove empty commits
From: Petr Baudis @ 2008-10-30 0:33 UTC (permalink / raw)
To: git; +Cc: Sverre Rabbelier
From: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Documentation/git-filter-branch.txt | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index fed6de6..2565244 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -246,6 +246,21 @@ git filter-branch --commit-filter '
fi' HEAD
------------------------------------------------------------------------------
+To remove commits that are empty (do not introduce any change):
+
+------------------------------------------------------------------------------
+git rev-list HEAD | while read c; do [ -n "$(git diff-tree --root $c)" ] || echo $c; done > revs
+
+git filter-branch --commit-filter '
+ if grep -q "$GIT_COMMIT" '"$(pwd)/"revs';
+ then
+ skip_commit "$@";
+ else
+ git commit-tree "$@";
+ fi' HEAD
+
+------------------------------------------------------------------------------
+
The function 'skip_commit' is defined as follows:
--------------------------
--
1.5.6.3.536.g61aad
^ permalink raw reply related
* Re: Pull request for sub-tree merge into /contrib/gitstats
From: Sverre Rabbelier @ 2008-10-30 0:38 UTC (permalink / raw)
To: Junio C Hamano, Git Mailinglist
In-Reply-To: <bd6139dc0810291606o2efe4254me378335b76861340@mail.gmail.com>
On Thu, Oct 30, 2008 at 00:06, Sverre Rabbelier <alturin@gmail.com> wrote:
> My work is available in the git repository at:
Please use instead:
> git://repo.or.cz/git-stats.git for-junio
Which has the "gitstats:" prefix to all commit messages, and does not
have the changelog file.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: [PATCH] git-filter-branch: Add an example on how to remove empty commits
From: Johannes Schindelin @ 2008-10-30 0:56 UTC (permalink / raw)
To: Petr Baudis; +Cc: git, Sverre Rabbelier
In-Reply-To: <1225326833-15210-1-git-send-email-pasky@suse.cz>
Hi,
On Wed, 29 Oct 2008, Petr Baudis wrote:
> +To remove commits that are empty (do not introduce any change):
> +
> +------------------------------------------------------------------------------
> +git rev-list HEAD | while read c; do [ -n "$(git diff-tree --root $c)" ] || echo $c; done > revs
> +
> +git filter-branch --commit-filter '
> + if grep -q "$GIT_COMMIT" '"$(pwd)/"revs';
> + then
> + skip_commit "$@";
> + else
> + git commit-tree "$@";
> + fi' HEAD
You would not need to use the temporary "revs" file by using something
(totally untested, of course):
git filter-branch --commit-filter '
if git diff-tree --exit-status -q "$GIT_COMMIT";
then
git commit-tree "$@";
else
skip_commit "$@";
fi' HEAD
Of course, you could also mention that you could use
git log --cherry-pick -p --pretty=format: ..<branch>@{1}
to verify that all skipped commits had empty diffs. That one is also
totally untested.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] git-filter-branch: Add an example on how to remove empty commits
From: Sam Vilain @ 2008-10-30 0:39 UTC (permalink / raw)
To: Petr Baudis; +Cc: git, Sverre Rabbelier
In-Reply-To: <1225326833-15210-1-git-send-email-pasky@suse.cz>
On Wed, 2008-10-29 at 17:33 -0700, Petr Baudis wrote:
> +To remove commits that are empty (do not introduce any change):
> +
> +------------------------------------------------------------------------------
> +git rev-list HEAD | while read c; do [ -n "$(git diff-tree --root $c)" ] || echo $c; done > revs
> +
> +git filter-branch --commit-filter '
> + if grep -q "$GIT_COMMIT" '"$(pwd)/"revs';
> + then
Why not put the git diff-tree in the commit filter?
Is this tested? It doesn't look like it does what the comment says...
surely you have to compare with the previous commit, not the null
commit?
Sam.
^ permalink raw reply
* Re: Encoding problems using git-svn
From: James North @ 2008-10-30 3:28 UTC (permalink / raw)
To: git
In-Reply-To: <8b168cfb0810282014r789ac01dnec51824de1078f0@mail.gmail.com>
Ok, I made a quick change in git-svn script and seems like is working
now in my system with locale set to iso-8859-1.
Dunno if this is the right place to post this, but I hope someone
knowledgeable see this and tells if this would work as a general fix.
This patch is against 1.6.0.2
--- git-svn 2008-09-15 13:04:46.000000000 +0200
+++ git-svn.mine 2008-10-30 04:21:09.000000000 +0100
@@ -43,6 +43,7 @@
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
use IPC::Open3;
use Git;
+use Encode;
BEGIN {
# import functions from Git into our packages, en masse
@@ -1061,6 +1062,7 @@
&& !$saw_from) {
$msgbuf .= "\n\nFrom: $author";
}
+ $msgbuf = encode("utf8", $msgbuf);
print $log_fh $msgbuf or croak $!;
command_close_pipe($msg_fh, $ctx);
}
On Wed, Oct 29, 2008 at 4:14 AM, James North <tocapicha@gmail.com> wrote:
> Hi,
>
> I'm using git-svn on a system with ISO-8859-1 encoding. The problem is
> when I try to use "git svn dcommit" to send changes to a remote svn
> (also ISO-8859-1).
>
> Seems like git-svn is sending commit messages with utf-8 (just a
> guessing...) and they look bad on the remote svn log. E.g. "Ca?\241a
> de cami?\243n"
>
> I have tried using i18n.commitencoding=ISO-8859-1 as suggested by the
> warning when doing "git svn dcommit" but messages still are sent with
> wrong encoding.
>
> I'm mising something?
>
> Thanks everyone
>
^ permalink raw reply
* [PATCH] Documentation: add a planning document for the next CLI revamp
From: Sam Vilain @ 2008-10-30 3:48 UTC (permalink / raw)
To: git, git; +Cc: Sam Vilain, Sam Vilain
From: Sam Vilain <samv@vilain.net>
For cross-command CLI changes to be effective, they need to be
cohesively planned. Add a planning document for this next set of
changes.
Signed-off-by: Sam Vilain <sam@vilain.net>
---
Some suggestions, which have been briefly scanned over by some of the
(remaining @4pm) GitTogether attendees.
Please keep it constructive! :)
Documentation/cli-revamp.txt | 135 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 135 insertions(+), 0 deletions(-)
create mode 100644 Documentation/cli-revamp.txt
diff --git a/Documentation/cli-revamp.txt b/Documentation/cli-revamp.txt
new file mode 100644
index 0000000..980ea07
--- /dev/null
+++ b/Documentation/cli-revamp.txt
@@ -0,0 +1,135 @@
+GIT command line revamp
+=======================
+
+This design document is designed for review and critique over planned
+direction for changing the command set used by git, rather than
+reviewing and critiquing individual changes.
+
+In general, old commands will be grandfathered for a year or longer,
+and all plumbing commands will still work as originally designed.
+
+Please bear in mind when critiquing that each of these changes might
+themselves have a progressive implementation, for instance the new
+behaviour being optional initially.
+
+Please try to be positive with your comments; let's try to come up
+with solutions and not argue about the details of the solutions
+presented until those details are submitted. In particular, critical
+comments that do not acknowledge the presence of a problem are
+worthless at this stage.
+
+Add/rm/reset/checkout/revert
+----------------------------
+
+Many find these confusing.
+
+ * 'git stage' would do what 'git add' does now.
+
+ * 'git unstage' would do what 'git reset --' does now
+
+ * 'git status' would encourage the user to use
+ 'git diff --staged' to see staged changes as a patch
+
+ * 'git commit' with no changes should give useful information about
+ using 'git stage', 'git commit -a' or 'git commit filename ...'
+
+ * 'git add' and 'git rm': no change
+
+ * 'git update-index' considered plumbing, not changed
+
+ * 'git revert' deprecated in favour of 'git cherry-pick --revert'
+
+ * 'git undo' would do what 'git checkout HEAD --' does now
+
+ * 'git checkout branch' would, if there is a remote branch called
+ 'branch' on exactly one remote, do what
+ 'git checkout -b branch thatremote/branch' does now. If it is
+ ambiguous, it would be an error, forcing the explicit notation.
+
+ * 'git branch --switch' : alternative to checkout
+
+
+Push/pull
+---------
+
+These commands are asymmetric, and this seems mostly historical.
+
+ * 'git push --matching' does what 'git push' does today (without
+ explicit configuration)
+
+ * 'git push' with no ref args and no 'push =' configuration does
+ what:
+ 'git push origin $(git symbolic-ref HEAD | sed "s!refs/heads/!!")'
+ does today. ie, it only pushes the current branch.
+ If a branch was defined in branch.<name>.push, push to that ref
+ instead of the matching one. If there is no matching ref, and
+ there is a branch.<name>.merge, push back there.
+
+ * 'git pull' behaviour unchanged
+
+ * 'git push' to checked out branch of non-bare repository not
+ allowed without special configuration. Configuration available
+ that allows working directory to be updated, known caveats
+ notwithstanding. Ideally, it would refuse only in situations
+ where a broken working copy would be left (because you couldn't
+ fix it), and work when it can be known to be safe.
+
+
+Informational
+-------------
+
+ * 'git branch' should default to '--color=auto -v'
+
+ * 'git tag -l' should show more information
+
+
+Working with patches
+--------------------
+
+ * 'git send-email' should prompt for all SMTP-related information
+ about sending e-mail when it is running with no configuration.
+ Because these days /usr/lib/sendmail is rarely configured
+ correctly.
+
+ * other git send-email functionality which has bitten people -
+ particularly building the recipient list - should prompt for
+ confirmation until configured to be automatic.
+
+ * 'git am -3' the default; with global option to make it not the
+ default for those that prefer the speed of -2
+
+
+Submodules
+----------
+
+ * submodules should be able to refer to symbolic ref names, svn
+ style - in the .gitmodules file. The actual commit used is still
+ recorded in the index.
+
+ * when switching branches, if the checked out revision of a submodule
+ changes, then it should be switched as well
+
+ * 'git submodule update' should be able to be triggered when
+ switching branches (but not be the default behaviour)
+
+
+Others
+------
+
+ * 'git export' command that does what
+ 'git archive --format=tar --prefix=dir | tar x' does now
+
+ * conflicted merges should point the user immediately to
+ 'git mergetool' and mention you need to use 'git stage' to mark
+ resolved files and 'git commit' when done.
+
+ * 'git init --server' (or similar) should do everything required for
+ exporting::
+----
+chmod -R a+rX
+touch git-daemon-export-ok
+git gc
+git update-server-info
+chmod u+x .git/hooks/post-update
+git config core.sharedrepository=1
+----
--
debian.1.5.6.1
^ permalink raw reply related
* Re: Using the --track option when creating a branch
From: Sam Vilain @ 2008-10-30 5:12 UTC (permalink / raw)
To: Bill Lear; +Cc: git
In-Reply-To: <18696.32778.842933.486171@lisa.zopyra.com>
On Wed, 2008-10-29 at 09:23 -0600, Bill Lear wrote:
> We use git in a way that makes it desirable for us to only push/pull
> to the same remote branch. So, if I'm in branch X, I want 'git push'
> to push to origin/X, and 'git pull' to fetch into origin/X and then
> merge into X from origin/X.
>
> In other words, we want git push/pull to behave in branches other than
> master the same way it does when in master.
>
> I have discovered the '--track' option when creating a local branch,
> and this appears to me to be the thing that gives us the desired
> behavior.
As things currently stand this is not achievable behaviour. The
behaviour of 'git push' is to push all matching refs. If you are lucky
this is what you intended, but it also pushes any changes to *other*
branches that you have made.
I have tabled a change proposal to make it work as you suggest in a
separate thread.
Sam
^ permalink raw reply
* Re: git adds some text file as binary file by mistake
From: Ping Yin @ 2008-10-30 6:32 UTC (permalink / raw)
To: Michael J Gruber; +Cc: Git Mailing List
In-Reply-To: <46dff0320810240630s5cbfa62esd10a9da45ce37bf8@mail.gmail.com>
On Fri, Oct 24, 2008 at 9:30 PM, Ping Yin <pkufranky@gmail.com> wrote:
> On Fri, Oct 24, 2008 at 8:54 PM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Ping Yin venit, vidit, dixit 24.10.2008 14:37:
>>> So what should i do if i want it added as text file?
>>
>> You should give us more detail on the file ;)
>> What's the extension, what's the typical content? It may be a simple
>> matter of specifying attributes.
>> Do ordinary diff and grep recognize your files as text?
>>
>> Michael
>>
>
> It's just an xml file. I guess maybe there are some hidden characters
> at the beginning. I will figure it out later because i have no access
> to that file right now.
>
> Ping Yin
>
I have figured it out. It's just because the BOM characters feff00 in
the beginning of the utf-8 xml file.
--
Ping Yin
^ permalink raw reply
* Re: [PATCH] Use find instead of perl in t5000 to get file modification time
From: Alex Riesen @ 2008-10-30 7:26 UTC (permalink / raw)
To: Jeff King; +Cc: Git Mailing List, Junio C Hamano, René Scharfe
In-Reply-To: <20081029215444.GA19874@sigill.intra.peff.net>
Jeff King, Wed, Oct 29, 2008 22:54:45 +0100:
> On Wed, Oct 29, 2008 at 11:38:32AM +0100, Alex Riesen wrote:
>
> > There can be a problem with "-printf": Open Group SUS does not specify
> > -printf for find(1), so it is probably a problem somewhere. I just don't know.
> > [...]
> > + find extract/a/a -printf "%T@\\n" >b.mtime &&
>
> $ uname -sr
> FreeBSD 6.1-RELEASE-p17-jc1
> $ find . -printf "%T@\\n"
> find: -printf: unknown option
>
> > There is always a fallback, which is to write a small program which calls
> > native stat(2). Or modify test-chmtime to just print mtime when asked.
>
> I think that makes the most sense.
>
Ok, will do.
^ permalink raw reply
* Re: Encoding problems using git-svn
From: Eric Wong @ 2008-10-30 7:41 UTC (permalink / raw)
To: James North; +Cc: git
In-Reply-To: <8b168cfb0810282014r789ac01dnec51824de1078f0@mail.gmail.com>
Hi James,
I saw your other patch too late, I had already started working on my
patch earlier today but got distracted by other things (being at
GitTogether :) and lacked a stable Internet connection afterwards.
Anyways, here's my version, it handles the case where the user specifies
the --edit option to interactively edit the commit message before
committing; and also reencodes the messages when fetching from SVN.
Can you let me know if it works for you?
Note: I'll be in transit tomorrow and may not have time to follow
up on this until Saturday.
>From 84f003e0c39414ebf27a98de167643e95bed6abb Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 29 Oct 2008 23:49:26 -0700
Subject: [PATCH] git-svn: respect i18n.commitencoding config
SVN itself always stores log messages in the repository as
UTF-8. git always stores/retrieves everything as raw binary
data with no transformations whatsoever.
To interact with SVN, we need to encode log messages as UTF-8
before sending them to SVN, as SVN cannot do it for us. When
retrieving log messages from SVN, we also need to (attempt to)
reencode the UTF-8 log message back to the user-specified commit
encoding.
Note, handling i18n.logoutputencoding for "git svn log" also
needs to be done in a future change.
Also, this change only deals with the encoding of commit
messages and nothing else (path names, blob content, ...).
In-Reply-To: <8b168cfb0810282014r789ac01dnec51824de1078f0@mail.gmail.com>
James North <tocapicha@gmail.com> wrote:
> Hi,
>
> I'm using git-svn on a system with ISO-8859-1 encoding. The problem is
> when I try to use "git svn dcommit" to send changes to a remote svn
> (also ISO-8859-1).
>
> Seems like git-svn is sending commit messages with utf-8 (just a
> guessing...) and they look bad on the remote svn log. E.g. "Ca?\241a
> de cami?\243n"
>
> I have tried using i18n.commitencoding=ISO-8859-1 as suggested by the
> warning when doing "git svn dcommit" but messages still are sent with
> wrong encoding.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
git-svn.perl | 24 ++++++++-
t/t9129-git-svn-i18n-commitencoding.sh | 80 ++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 3 deletions(-)
create mode 100755 t/t9129-git-svn-i18n-commitencoding.sh
diff --git a/git-svn.perl b/git-svn.perl
index f90ddac..f24559c 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1136,9 +1136,19 @@ sub get_commit_entry {
system($editor, $commit_editmsg);
}
rename $commit_editmsg, $commit_msg or croak $!;
- open $log_fh, '<', $commit_msg or croak $!;
- { local $/; chomp($log_entry{log} = <$log_fh>); }
- close $log_fh or croak $!;
+ {
+ # SVN requires messages to be UTF-8 when entering the repo
+ local $/;
+ open $log_fh, '<', $commit_msg or croak $!;
+ binmode $log_fh;
+ chomp($log_entry{log} = <$log_fh>);
+
+ if (my $enc = Git::config('i18n.commitencoding')) {
+ require Encode;
+ Encode::from_to($log_entry{log}, $enc, 'UTF-8');
+ }
+ close $log_fh or croak $!;
+ }
unlink $commit_msg;
\%log_entry;
}
@@ -2273,6 +2283,14 @@ sub do_git_commit {
}
defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
or croak $!;
+ binmode $msg_fh;
+
+ # we always get UTF-8 from SVN, but we may want our commits in
+ # a different encoding.
+ if (my $enc = Git::config('i18n.commitencoding')) {
+ require Encode;
+ Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
+ }
print $msg_fh $log_entry->{log} or croak $!;
restore_commit_header_env($old_env);
unless ($self->no_metadata) {
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
new file mode 100755
index 0000000..2848e46
--- /dev/null
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Eric Wong
+
+test_description='git svn honors i18n.commitEncoding in config'
+
+. ./lib-git-svn.sh
+
+compare_git_head_with () {
+ nr=`wc -l < "$1"`
+ a=7
+ b=$(($a + $nr - 1))
+ git cat-file commit HEAD | sed -ne "$a,${b}p" >current &&
+ test_cmp current "$1"
+}
+
+compare_svn_head_with () {
+ LC_ALL=en_US.UTF-8 svn log --limit 1 `git svn info --url` | \
+ sed -e 1,3d -e "/^-\+\$/d" >current &&
+ test_cmp current "$1"
+}
+
+for H in ISO-8859-1 EUCJP ISO-2022-JP
+do
+ test_expect_success "$H setup" '
+ mkdir $H &&
+ svn import -m "$H test" $H "$svnrepo"/$H &&
+ git svn clone "$svnrepo"/$H $H
+ '
+done
+
+for H in ISO-8859-1 EUCJP ISO-2022-JP
+do
+ test_expect_success "$H commit on git side" '
+ (
+ cd $H &&
+ git config i18n.commitencoding $H &&
+ git checkout -b t refs/remotes/git-svn &&
+ echo $H >F &&
+ git add F &&
+ git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+ E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+ test "z$E" = "z$H"
+ compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+ )
+ '
+done
+
+for H in ISO-8859-1 EUCJP ISO-2022-JP
+do
+ test_expect_success "$H dcommit to svn" '
+ (
+ cd $H &&
+ git svn dcommit &&
+ git cat-file commit HEAD | grep git-svn-id: &&
+ E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+ test "z$E" = "z$H" &&
+ compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+ )
+ '
+done
+
+test_expect_success 'ISO-8859-1 should match UTF-8 in svn' '
+(
+ cd ISO-8859-1 &&
+ compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+)
+'
+
+for H in EUCJP ISO-2022-JP
+do
+ test_expect_success '$H should match UTF-8 in svn' '
+ (
+ cd $H &&
+ compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+ )
+ '
+done
+
+test_done
--
Eric Wong
^ permalink raw reply related
* Re: request for pre-generated git.info pages
From: Mike Ralphson @ 2008-10-30 9:06 UTC (permalink / raw)
To: SLONIK.AZ, Git Mailing List; +Cc: Junio C Hamano, Jeff King
In-Reply-To: <ee2a733e0810291500o67b3f94fibef63e0a173e8cc1@mail.gmail.com>
2008/10/29 Leo Razoumov <slonik.az@gmail.com>:
> I am an emacs user but with my current setup I have difficulties
> generating git.info pages. Main Git repo already provides
> pre-generated man and html documentation in "man" and "html"
> branches. I would kindly beg to extend this privilege to "info" pages
> to benefit all the emacs users out there.
Unfortunately I don't have a working asciidoc etc toolchain either
(though I will take a look at getting it working on my central git box
which is Linux based). As I'm not an emacs or Info user I probably
wouldn't know if they were building correctly anyway.
However, if anyone can do the above, I'll be happy to help them get
set up to push an 'info' branch to gitbuild.git
(http://repo.or.cz/w/git/gitbuild.git).
How often would you want the info pages rebuilt? Just the versions
which Junio tags? Or would you only want them built from one branch
(e.g. maint)?
Mike
^ permalink raw reply
* Re: request for pre-generated git.info pages
From: Miklos Vajna @ 2008-10-30 9:33 UTC (permalink / raw)
To: Mike Ralphson; +Cc: SLONIK.AZ, Git Mailing List, Junio C Hamano, Jeff King
In-Reply-To: <e2b179460810300206g79e06c63m2060092fa654b18b@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
On Thu, Oct 30, 2008 at 09:06:35AM +0000, Mike Ralphson <mike.ralphson@gmail.com> wrote:
> How often would you want the info pages rebuilt? Just the versions
> which Junio tags? Or would you only want them built from one branch
> (e.g. maint)?
Probably it could be done in a similar way to the html and the man pages
(each time master is updated + for tags).
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [StGit PATCH 2/3] stgit.el: Added numeric prefix argument to push and pop commands.
From: David Kågedal @ 2008-10-30 9:52 UTC (permalink / raw)
To: kha, catalin.marinas; +Cc: git
In-Reply-To: <20081030095221.10290.58637.stgit@krank>
By using a numerical prefix (or simply C-u) it is possible to push or
pop more than one patch.
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
---
contrib/stgit.el | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/contrib/stgit.el b/contrib/stgit.el
index e6b7d70..9907952 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -276,16 +276,19 @@ Commands:
(stgit-capture-output nil (stgit-run "uncommit" "-n" (number-to-string arg)))
(stgit-refresh))
-(defun stgit-push-next ()
- "Push the first unapplied patch"
- (interactive)
- (stgit-capture-output nil (stgit-run "push"))
+(defun stgit-push-next (npatches)
+ "Push the first unapplied patch.
+With numeric prefix argument, push that many patches."
+ (interactive "p")
+ (stgit-capture-output nil (stgit-run "push" "-n"
+ (number-to-string npatches)))
(stgit-refresh))
-(defun stgit-pop-next ()
- "Pop the topmost applied patch"
- (interactive)
- (stgit-capture-output nil (stgit-run "pop"))
+(defun stgit-pop-next (npatches)
+ "Pop the topmost applied patch.
+With numeric prefix argument, pop that many patches."
+ (interactive "p")
+ (stgit-capture-output nil (stgit-run "pop" "-n" (number-to-string npatches)))
(stgit-refresh))
(defun stgit-applied-at-point ()
^ permalink raw reply related
* [StGit PATCH 3/3] stgit.el: Adapt to new output from stg series.
From: David Kågedal @ 2008-10-30 9:52 UTC (permalink / raw)
To: kha, catalin.marinas; +Cc: git
In-Reply-To: <20081030095221.10290.58637.stgit@krank>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
---
contrib/stgit.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/contrib/stgit.el b/contrib/stgit.el
index 9907952..d0f19c3 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -131,7 +131,8 @@ Argument DIR is the repository path."
(when (memq patchsym stgit-marked-patches)
(replace-match "*" nil nil nil 2)
(setq marked (cons patchsym marked)))))
- ((looking-at "stg series: Branch \".*\" not initialised")
+ ((or (looking-at "stg series: Branch \".*\" not initialised")
+ (looking-at "stg series: .*: branch not initialized"))
(forward-line 1)
(insert "Run M-x stgit-init to initialise")))
(forward-line 1))
^ permalink raw reply related
* [StGit PATCH 0/3] stgit.el patches
From: David Kågedal @ 2008-10-30 9:52 UTC (permalink / raw)
To: kha, catalin.marinas; +Cc: git
These three patches updates stgit.el. They don't depend on each other
and can be applied independently.
---
David Kågedal (3):
stgit.el: Adapt to new output from stg series.
stgit.el: Added numeric prefix argument to push and pop commands.
stgit.el: Added undo command
contrib/stgit.el | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
--
Signature
^ permalink raw reply
* [StGit PATCH 1/3] stgit.el: Added undo command
From: David Kågedal @ 2008-10-30 9:52 UTC (permalink / raw)
To: kha, catalin.marinas; +Cc: git
In-Reply-To: <20081030095221.10290.58637.stgit@krank>
Bound it to the two standard bindings C-/ and C-_.
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
---
contrib/stgit.el | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/contrib/stgit.el b/contrib/stgit.el
index aafefaf..e6b7d70 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -165,7 +165,9 @@ Argument DIR is the repository path."
(define-key stgit-mode-map "P" 'stgit-push-or-pop)
(define-key stgit-mode-map "G" 'stgit-goto)
(define-key stgit-mode-map "=" 'stgit-show)
- (define-key stgit-mode-map "D" 'stgit-delete))
+ (define-key stgit-mode-map "D" 'stgit-delete)
+ (define-key stgit-mode-map [(control ?/)] 'stgit-undo)
+ (define-key stgit-mode-map "\C-_" 'stgit-undo))
(defun stgit-mode ()
"Major mode for interacting with StGit.
@@ -408,4 +410,14 @@ Commands:
(interactive)
(describe-function 'stgit-mode))
+(defun stgit-undo (&optional arg)
+ "Run stg undo.
+With prefix argument, run it with the --hard flag."
+ (interactive "P")
+ (stgit-capture-output nil
+ (if arg
+ (stgit-run "undo" "--hard")
+ (stgit-run "undo")))
+ (stgit-refresh))
+
(provide 'stgit)
^ permalink raw reply related
* [PATCH] asciidoc: add minor workaround to add an empty line after code blocks
From: Jonas Fonseca @ 2008-10-30 10:45 UTC (permalink / raw)
To: Teemu Likonen; +Cc: Junio C Hamano, git
In-Reply-To: <87od13ujm4.fsf@iki.fi>
Insert an empty <simpara> in manpages after code blocks to force and
empty line.
The problem can be seen on the manpage for the git tutorial, where an
example command and the following paragraph is printed with no empty
line between them:
First, note that you can get documentation for a command such as git
log --graph with:
$ man git-log
It is a good idea to introduce yourself to git [...]
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
Documentation/asciidoc.conf | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
Teemu Likonen <tlikonen@iki.fi> wrote Thu, Oct 30, 2008:
> In case someone is interested there is still a minor flaw that an
> example command and the following paragraph is printed with no empty
> line between them. Like in the beginning of "git help tutorial", for
> example:
>
> First, note that you can get documentation for a command such as git
> log --graph with:
>
> $ man git-log
> It is a good idea to introduce yourself to git [...]
>
> It would be nicer if there was empty line after "$ man git-log". I can't
> remember if this is new issue or not. This applies only to man pages; in
> html pages there are nice boxes around example commands and equal
> spacing before and after them.
This is an old issue reported by Theodore Ts'o and fixed partially in
commit 63c97ce228f2d2697a8ed954a9592dfb5f286338 for the URL section of
the fetch/pull/push manpages. I have fixed this in tig using an
approach similar to the attached. Simple and clean, but only tested
with docbook-xsl version 1.72 so I have made it conditional.
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 40d43b7..2da867d 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -40,6 +40,26 @@ endif::doctype-manpage[]
</literallayout>
{title#}</example>
endif::docbook-xsl-172[]
+
+ifdef::docbook-xsl-172[]
+ifdef::doctype-manpage[]
+# The following two small workarounds insert a simple paragraph after screen
+[listingblock]
+<example><title>{title}</title>
+<screen>
+|
+</screen><simpara></simpara>
+{title#}</example>
+
+[verseblock]
+<formalpara{id? id="{id}"}><title>{title}</title><para>
+{title%}<literallayout{id? id="{id}"}>
+{title#}<literallayout>
+|
+</literallayout><simpara></simpara>
+{title#}</para></formalpara>
+endif::doctype-manpage[]
+endif::docbook-xsl-172[]
endif::backend-docbook[]
ifdef::doctype-manpage[]
--
1.6.0.3.756.gb776d.dirty
--
Jonas Fonseca
^ permalink raw reply related
* Re: [JGIT RFC PATCH 3/3] Rate limit warnings spewed by RepositoryTestCase.recursiveDelete
From: Jonas Fonseca @ 2008-10-30 10:46 UTC (permalink / raw)
To: Robin Rosenberg; +Cc: Shawn O. Pearce, git
In-Reply-To: <200810240110.21755.robin.rosenberg@dewire.com>
Robin Rosenberg <robin.rosenberg@dewire.com> wrote Fri, Oct 24, 2008:
> onsdagen den 22 oktober 2008 10.34.20 skrev Jonas Fonseca:
> > On Windows XP / NTFS / NetBeans 6.1 / Java 5 a lot of warnings are
> > printed. In most cases the path is in fact deleted and it seems to
> > just be a timing bug or something Windows or NTFS specific.
>
> The problem is actually flaws in the unit tests and in the supporting
> RepositoryTestCase. I think I'll fix that instead.
Thanks. Any progress on this? Can I help in any way?
--
Jonas Fonseca
^ permalink raw reply
* Re: [PATCH] Documentation: add a planning document for the next CLI revamp
From: Stefan Karpinski @ 2008-10-30 10:55 UTC (permalink / raw)
To: Sam Vilain; +Cc: git
In-Reply-To: <1225338485-11046-1-git-send-email-sam@vilain.net>
These proposed changes look great.
On Wed, Oct 29, 2008 at 8:48 PM, Sam Vilain <sam@vilain.net> wrote:
> + * 'git unstage' would do what 'git reset --' does now
Would it make sense to deprecate using "git reset --" for this then?
It's always seemed confusing to me to have such disparate
functionality in the reset command.
> + * 'git export' command that does what
> + 'git archive --format=tar --prefix=dir | tar x' does now
It would be nice if the "git export" command could "checkout" a
non-repo copy of a remote repo at a specific version. This would be as
simple as calling archive on the remote size and then unarchiving it
locally. But would of course take care of all the plumbing.
(Sorry for the resend, Sam.)
^ permalink raw reply
* [PATCH 1/2] Add --verbose|-v to test-chmtime
From: Alex Riesen @ 2008-10-30 11:26 UTC (permalink / raw)
To: Jeff King; +Cc: Git Mailing List, Junio C Hamano, René Scharfe
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
This allows us replace perl when getting the mtime of a file because
of time zone conversions, though at the moment only one platform which
does this has been identified: Cygwin when used with ActiveState Perl
(as usual).
The output format is:
<mtime1> TAB <filename1> <LF>
<mtime2> TAB <filename2> <LF>
...
which, if only mtime is needed can be parsed with cut(1):
test-chmtime -v +0 filename1 | cut -f 1
Also, the change adds a description of programs features, with examples.
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
---
test-chmtime.c | 91 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 21 deletions(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-verbose-v-to-test-chmtime.patch --]
[-- Type: text/x-diff; name=0001-Add-verbose-v-to-test-chmtime.patch, Size: 3995 bytes --]
From a59f17013cc54112d0bd11550b273baa6e312776 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 30 Oct 2008 10:00:29 +0100
Subject: [PATCH 1/2] Add --verbose|-v to test-chmtime
This allows us replace perl when getting the mtime of a file because
of time zone conversions, though at the moment only one platform which
does this has been identified: Cygwin when used with ActiveState Perl
(as usual).
The output format is:
<mtime1> TAB <filename1> <LF>
<mtime2> TAB <filename2> <LF>
...
which, if only mtime is needed can be parsed with cut(1):
test-chmtime -v +0 filename1 | cut -f 1
Also, the change adds a description of programs features, with examples.
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
---
test-chmtime.c | 91 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 21 deletions(-)
diff --git a/test-chmtime.c b/test-chmtime.c
index 90da448..d5358cb 100644
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -1,39 +1,83 @@
+/*
+ * This program can either change modification time of the given
+ * file(s) or just print it. The program does not change atime nor
+ * ctime (their values are explicitely preserved).
+ *
+ * The mtime can be changed to an absolute value:
+ *
+ * test-chmtime =<seconds> file...
+ *
+ * Relative to the current time as returned by time(3):
+ *
+ * test-chmtime =+<seconds> (or =-<seconds>) file...
+ *
+ * Or relative to the current mtime of the file:
+ *
+ * test-chmtime <seconds> file...
+ * test-chmtime +<seconds> (or -<seconds>) file...
+ *
+ * Examples:
+ *
+ * To just print the mtime use --verbose and set the file mtime offset to 0:
+ *
+ * test-chmtime -v +0 file
+ *
+ * To set the mtime to current time:
+ *
+ * test-chmtime =+0 file
+ *
+ */
#include "git-compat-util.h"
#include <utime.h>
-static const char usage_str[] = "(+|=|=+|=-|-)<seconds> <file>...";
+static const char usage_str[] = "-v|--verbose (+|=|=+|=-|-)<seconds> <file>...";
-int main(int argc, const char *argv[])
+static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
{
- int i;
- int set_eq;
- long int set_time;
char *test;
- const char *timespec;
-
- if (argc < 3)
- goto usage;
-
- timespec = argv[1];
- set_eq = (*timespec == '=') ? 1 : 0;
- if (set_eq) {
+ const char *timespec = arg;
+ *set_eq = (*timespec == '=') ? 1 : 0;
+ if (*set_eq) {
timespec++;
if (*timespec == '+') {
- set_eq = 2; /* relative "in the future" */
+ *set_eq = 2; /* relative "in the future" */
timespec++;
}
}
- set_time = strtol(timespec, &test, 10);
+ *set_time = strtol(timespec, &test, 10);
if (*test) {
- fprintf(stderr, "Not a base-10 integer: %s\n", argv[1] + 1);
- goto usage;
+ fprintf(stderr, "Not a base-10 integer: %s\n", arg + 1);
+ return 0;
}
- if ((set_eq && set_time < 0) || set_eq == 2) {
+ if ((*set_eq && *set_time < 0) || *set_eq == 2) {
time_t now = time(NULL);
- set_time += now;
+ *set_time += now;
}
+ return 1;
+}
+
+int main(int argc, const char *argv[])
+{
+ static int verbose;
- for (i = 2; i < argc; i++) {
+ int i = 1;
+ /* no mtime change by default */
+ int set_eq = 0;
+ long int set_time = 0;
+
+ if (argc < 3)
+ goto usage;
+
+ if (strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
+ verbose = 1;
+ ++i;
+ }
+ if (timespec_arg(argv[i], &set_time, &set_eq))
+ ++i;
+ else
+ goto usage;
+
+ for (; i < argc; i++) {
struct stat sb;
struct utimbuf utb;
@@ -46,7 +90,12 @@ int main(int argc, const char *argv[])
utb.actime = sb.st_atime;
utb.modtime = set_eq ? set_time : sb.st_mtime + set_time;
- if (utime(argv[i], &utb) < 0) {
+ if (verbose) {
+ uintmax_t mtime = utb.modtime < 0 ? 0: utb.modtime;
+ printf("%"PRIuMAX"\t%s\n", mtime, argv[i]);
+ }
+
+ if (utb.modtime != sb.st_mtime && utime(argv[i], &utb) < 0) {
fprintf(stderr, "Failed to modify time on %s: %s\n",
argv[i], strerror(errno));
return -1;
--
1.6.0.3.552.g4ff73
^ permalink raw reply related
* [PATCH 2/2] Use test-chmtime -v instead of perl in t5000 to get mtime of a file
From: Alex Riesen @ 2008-10-30 11:27 UTC (permalink / raw)
To: Jeff King; +Cc: Git Mailing List, Junio C Hamano, René Scharfe
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
The test was broken on admittedly broken combination of Windows, Cygwin,
and ActiveState Perl.
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
---
t/t5000-tar-tree.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-Use-test-chmtime-v-instead-of-perl-in-t5000-to-get.patch --]
[-- Type: text/x-diff; name=0002-Use-test-chmtime-v-instead-of-perl-in-t5000-to-get.patch, Size: 990 bytes --]
From 1013c1a2b51a183bd0f6059b2e1a1ed68b2173d5 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 30 Oct 2008 11:20:27 +0100
Subject: [PATCH 2/2] Use test-chmtime -v instead of perl in t5000 to get mtime of a file
The test was broken on admittedly broken combination of Windows, Cygwin,
and ActiveState Perl.
Signed-off-by: Alex Riesen <ariesen@harmanbecker.com>
---
t/t5000-tar-tree.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 0f27d73..c942c8b 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -90,7 +90,7 @@ test_expect_success \
'validate file modification time' \
'mkdir extract &&
"$TAR" xf b.tar -C extract a/a &&
- perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime &&
+ test-chmtime -v +0 extract/a/a |cut -f 1 >b.mtime &&
echo "1117231200" >expected.mtime &&
diff expected.mtime b.mtime'
--
1.6.0.3.552.g4ff73
^ permalink raw reply related
* Re: [StGit PATCH 1/3] stgit.el: Added undo command
From: Karl Hasselström @ 2008-10-30 11:57 UTC (permalink / raw)
To: David Kågedal; +Cc: catalin.marinas, git
In-Reply-To: <20081030095248.10290.81253.stgit@krank>
On 2008-10-30 10:52:48 +0100, David Kågedal wrote:
> Bound it to the two standard bindings C-/ and C-_.
> + (define-key stgit-mode-map [(control ?/)] 'stgit-undo)
> + (define-key stgit-mode-map "\C-_" 'stgit-undo))
Hmm, why do you spell control in two different ways?
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox