Commit Graph

41635 Commits

Author SHA1 Message Date
Paul Mackerras
39ad85705c Accommodate new git-diff-tree output format
Add 'f' key for moving to next file
2005-05-19 12:35:53 +00:00
Paul Mackerras
5842215ee9 Handle \ No newline at end of line lines in diff
Put (deleted) or (created, mode xxx) in header lines
Fix scrolling to bring lines on screen
2005-05-19 10:56:42 +00:00
Linus Torvalds
9b632be30c merge-base: use the new lookup_commit_reference() helper function
This allows you to use tags for merge bases.
2005-05-18 16:16:51 -07:00
Linus Torvalds
961784ee42 commit: add "lookup_commit_reference()" helper function
It's pretty much the same as "lookup_commit()", but it will take
tags too, and look up the commit (if any) associated with them.
2005-05-18 16:14:22 -07:00
Paul Mackerras
173860663e More fixes for geometry restoration
Make up/down/pgup/pgdn work again
Return in find string entry does find
Scale circles and lines with font size
Fix scrolling to make entire selected line visible
Use white circle for commits not listed but put in to terminate lines
Fix diff parsing for created and deleted files
2005-05-18 22:51:00 +00:00
Nicolas Pitre
fbab835c03 [PATCH] fix show_date() for positive timezones
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-18 14:23:04 -07:00
Linus Torvalds
850e82d889 diff-tree: don't match non-directories as partial pathnames
This normally doesn't matter, but if you have a filename that is
sometimes a directory and sometimes a regular file (or symlink),
we don't want the regular file case to trigger a "partial match".
2005-05-18 14:17:22 -07:00
Linus Torvalds
ed1a368ba1 diff-tree: fix "whole sub-tree disappeared or appeared" case
We still need to check which part of the sub-tree is interesting.
2005-05-18 14:07:42 -07:00
Linus Torvalds
cb6c8ed2fe diff-tree: fix up comparison of "interesting" sub-trees
We used to trigger the "interesting subdirectory" check for any
matching name that started with the same character series, regardless
of whether it had the matching slash or not.
2005-05-18 13:50:24 -07:00
Linus Torvalds
73848892ad diff-tree: show hex sha1 of the single-commit argument case correctly.
We can't just do the "sha1_to_hex()" thing directly, since the
buffer in question will be overwritten by the name of the parent.

So teach diff_tree_commit() to generate the proper hex name itself.
2005-05-18 13:43:58 -07:00
Linus Torvalds
0a8365a179 diff-tree: fix and extend argument parsing
We use "--" to mark end of command line switches, not "-". Also,
allow more flexibility in the passed-in sha1 names, in that a
single sha1 uses the "commit-diff" logic that compares against
its parent(s).
2005-05-18 13:10:17 -07:00
Linus Torvalds
b11645be01 diff-tree: clean up diff_tree_stdin() function
Split it into the "one commit" vs "two trees" case, since we'll
want to use the "one commit" case for other things too.
2005-05-18 13:06:47 -07:00
Linus Torvalds
e11b29c50c diff-helper: pass unrecognized lines through unmodified
(and flush any pending renames)
2005-05-18 11:33:46 -07:00
Linus Torvalds
ad87de7c9d strbuf: allow zero-length lines
They aren't EOF.
2005-05-18 11:33:06 -07:00
Junio C Hamano
915838c3cb [PATCH] Diff-helper update
This patch adds a framework and a stub implementation of rename
detection to diff-helper program.

The current stub code is just enough to detect pure renames in
diff-tree output and not fancier.  The plan is perhaps to use
the same delta code when Nico's delta storage patch is merged
for similarity evaluation purposes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-18 11:16:24 -07:00
Linus Torvalds
e7bd907db6 fsck-cache: read the default reference information even when
not doing reachability analysis.

This avoids the dangling head problem, and means that just a
plain "git-fsck-cache" with no parameters will DTRT.
2005-05-18 10:19:59 -07:00
Linus Torvalds
1024932f01 fsck-cache: walk the 'refs' directory if the user doesn't give any
explicit references for reachability analysis.

We already had that as separate logic in git-prune-script, so this
is not a new special case - it's an old special case moved into
fsck, making normal usage be much simpler.
2005-05-18 10:16:14 -07:00
Junio C Hamano
b58f23b38a [PATCH] Fix diff output take #4.
This implements the output format suggested by Linus in
<Pine.LNX.4.58.0505161556260.18337@ppc970.osdl.org>, except the
imaginary diff option is spelled "diff --git" with double dashes as
suggested by Matthias Urlichs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-18 09:39:40 -07:00
Brian Gerst
bf0f910d1d [PATCH] Kill a bunch of pointer sign warnings for gcc4
- Raw hashes should be unsigned char.
 - String functions want signed char.
 - Hash and compress functions want unsigned char.

Signed-off By: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-18 08:44:23 -07:00
Linus Torvalds
6a9853cd45 Make "applypatch" use the "-E" flag to patch.
Always remove empty files, regardless of how the diff
showed them to have become empty.
2005-05-17 17:15:56 -07:00
Paul Mackerras
df3d83b143 Error popups on error conditions rather than stderr msgs
Stop . bindings firing on find string entry keypresses
Fix geometry saving/restoring a bit
Show the terminal commits
Highlight comment matches in the comment window
2005-05-17 23:23:07 +00:00
Linus Torvalds
02481aec2a Add silly "git-whatchanged" script.
It's a one-liner, but it's useful as documentation if nothing else.
2005-05-17 11:47:13 -07:00
Linus Torvalds
c9049d41b8 Update applypatch to use new GIT_-prefix environment variables.
Avoid the warnings from newer git versions.
2005-05-17 09:35:01 -07:00
Paul Mackerras
0fba86b3a9 save window geometry on exit, and restore it on startup 2005-05-16 23:54:58 +00:00
Paul Mackerras
43bddeb43d Resize the panes in the paned windows (commit list and details)
to keep the proportionality of the pane widths as the overall
window is resized.
2005-05-15 23:19:18 +00:00
Junio C Hamano
14cd1ff396 [PATCH 4/4] Trivial test harness fixes.
The documentation of the test harness still refer to old
numbering and also contains an obvious typo.

Also "make test" should be run after making sure we have built
all binaries, since test is designed to test the newly built
ones.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-16 00:22:10 +02:00
Paul Mackerras
e47120cb93 Fix stder -> stderr 2005-05-15 21:49:26 +00:00
Paul Mackerras
276819b35b Bumped version number 2005-05-15 12:57:02 +00:00
Paul Mackerras
1d10f36d7f Made commit list reading asynchronous
Added control+/- to increase/decrease font sizes
Rearranged code a little.
2005-05-15 12:55:47 +00:00
Petr Baudis
7ab6f3d437 Remove obsolete note about native CPU byte format
Comment in entry.h said that the cache contents is in the native CPU
byte format, which is really not true anymore for quite some time.
2005-05-15 12:38:55 +02:00
Brad Roberts
dbbce55b3a Rename some more cache-related functions
same_name -> ce_same_name()
remove_entry_at() -> remove_cache_entry_at()

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 12:37:39 +02:00
Brad Roberts
5d728c8411 Rename cache_match_stat() to ce_match_stat()
Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 12:26:25 +02:00
Brad Roberts
127cfd0d2f Cleanup the x-allocation functions
xmalloc() and xrealloc() now take their sizes as size_t-type arguments.
Introduced complementary xcalloc().

Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 11:58:12 +02:00
Paul Mackerras
98f350e501 Add a widget to show the SHA1 ID of the current commit
Add a find facility to search within the commits
Cope with multiple starting points.
2005-05-15 05:56:51 +00:00
Junio C Hamano
902b92e00e [PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).
It used to be that diff-tree needed helper support to parse its
raw output to generate diffs, but these days git-diff-* family
produces the same output and the helper is not tied to diff-tree
anymore.  Drop "tree" from its name.

This follows the "rename only" commit to adjust the contents of
the files involved.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 02:06:05 +02:00
Junio C Hamano
99665af5c0 [PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.
It used to be that diff-tree needed helper support to parse its
raw output to generate diffs, but these days git-diff-* family
produces the same output and the helper is not tied to diff-tree
anymore.  Drop "tree" from its name.

This commit is done separately to record just the rename and no
file content changes. The changes in the renamed files are recorded
in the next commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Bundled with the changes in the unrenamed files.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 02:05:03 +02:00
Junio C Hamano
13ab4462d2 The test of the basic diff functionality
This test comes from "[PATCH 2/2] The core GIT tests: recent additions and
fixes" but couldn't be included before since it depended on the modechange
diff output changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 02:00:29 +02:00
Junio C Hamano
273b98343c [PATCH 1/3] Update mode-change strings in diff output.
This updates the mode change strings to be a bit more machine
friendly.  Although this might go against the spirit of
readability for human consumption, these mode bits strings are
shown only when unusual things (mode change, file creation and
deletion) happens, output normalized for machine consumption
would be permissible.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 01:49:30 +02:00
Junio C Hamano
2ecd90502f [PATCH] Add the merge test Linus called "test script from hell".
This is an adaptation to the test framework of a historic test
that was used before three way merge form of read-tree was
introduced, and subsequently used to validate the read-tree -m
merge works correctly.  It covers all the tricky cases known
back then and also have been updated to cover conflicting
files/directories cases since then.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 01:44:30 +02:00
Petr Baudis
1bb4624417 Fixed misnamed t/t2010-update-cache-badpath.sh
mv t/t2010-update-cache-badpath.sh t/t2100-update-cache-badpath.sh
2005-05-15 01:42:31 +02:00
Junio C Hamano
947adb2739 [PATCH] Test GIT environment use.
This test makes sure that use of deprecated environment variables still
works, using both new and old names makes new one take
precedence, and GIT_DIR and GIT_ALTERNATE_OBJECT_DIRECTORIES mechanisms
work.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-15 01:40:05 +02:00
Petr Baudis
f50c9f76ca Rename some test scripts and describe the naming convention
First digit: "family", e.g. the absolute basics and global stuff (0),
the basic db-side commands (read-tree, write-tree, commit-tree), the
basic working-tree-side commands (checkout-cache, update-cache), the
other basic commands (ls-files), the diff commands, the pull commands,
exporting commands, revision tree commands...

Second digit: the particular command we are testing

Third digit: (optionally) the particular switch or group of switches
we are testing

Freeform part: commandname-details

Described in the README.

	mv t1000-checkout-cache.sh t2000-checkout-cache-clash.sh
	mv t1001-checkout-cache.sh t2001-checkout-cache-clash.sh
	mv t0200-update-cache.sh t2010-update-cache-badpath.sh
	mv t0400-ls-files.sh t3000-ls-files-others.sh
	mv t0500-ls-files.sh t3010-ls-files-killed.sh
2005-05-15 01:34:22 +02:00
Junio C Hamano
986aa7f17e [PATCH 2/2] Test framework documentation.
This adds instruction for running tests, and writing new tests.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Updated to the new tidied up output style.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-14 18:14:45 +02:00
Junio C Hamano
886856aba2 [PATCH 1/2] Test suite fixup.
Exposing test_expect_success and test_expect_failure turns out
to be enough for the test scripts and there is no need for
exposing test_ok or test_failure.  This patch cleans it up and
fixes the users of test_ok and test_failure.

Also test scripts have acquired a new command line flag
'--immediate' to cause them to exit upon the first failure.
This is useful especially during the development of a new test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-14 18:06:21 +02:00
Petr Baudis
94e8afa285 Try to make test output look better
NO changed to FAIL and ok was right-aligned with it so that it is easier
to visually identify the failed tests, and the removal of # should reduce
the clutter on the line and aid the eye to spot the test number better.
2005-05-14 18:01:30 +02:00
Petr Baudis
d6928ebd50 t/Makefile: OPTS -> GIT_TEST_OPTS
This way, passing this variable through the environment actually makes
sense.
2005-05-14 17:58:22 +02:00
Petr Baudis
902d960b38 t/Makefile cleanup
t/Makefile now does not use double-colon rules (why would it?), the rm
-fr trash in the all rule is silent, and OPTS aren't set to blank so
that they can be taken from the environment.
2005-05-14 17:57:32 +02:00
Petr Baudis
dfe070511c Implemented make test
make test in project root will recurse to the t/ subdirectory and run
make all there.
2005-05-14 17:45:33 +02:00
Petr Baudis
ceede59ea9 Fixed t0000-basic.sh and test-lib.sh permissions
The +x bit was missing. I applied the original patch three times and set
the permissions correctly two times. Guess which was the time I forgot.
2005-05-14 17:42:02 +02:00
Junio C Hamano
368f99d57e [PATCH 2/2] The core GIT tests: recent additions and fixes.
This set of scripts are designed to test the features and fixes
we recently added to core GIT.  The convention to call test
helper function has been changed during the framework cleanup
(take two), and these tests have been updated to use the cleaned
up test-lib.sh interface.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Note that this does not include the t2000-diff.sh script since it
tests a patch which was not applied yet.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
2005-05-14 17:41:01 +02:00