Commit Graph

739 Commits

Author SHA1 Message Date
Pieter de Bie 8df614cb53 GitIndex: add basic commit method 2009-09-13 16:55:38 +02:00
Pieter de Bie f51fd6c214 GitIndexController: Migrate stageFiles functions to GitIndex 2009-09-13 16:55:38 +02:00
Pieter de Bie 35a4dc37e2 GitIndex: Add methods to stage and unstage files
These are mostly copies from PBGitIndexController, and
they can be refactored to a common method. I'm not sure of a name
for that yet, so I'll keep it like this for now :)
2009-09-13 16:55:38 +02:00
Pieter de Bie 64a52ad9e0 CommitView: Migrate diff displaying away from IndexController 2009-09-13 16:55:38 +02:00
Pieter de Bie 07417acd51 GitIndex: add support for retrieving diffs 2009-09-13 16:55:38 +02:00
Pieter de Bie 03e1d3e882 WIP: Add GUI support for the new index 2009-09-13 16:55:38 +02:00
Pieter de Bie 6531cfce3b Add a new class, PBGitIndex, which integrates functionality from both indexcontrollers 2009-09-13 16:55:38 +02:00
Pieter de Bie 44768921f3 GitRevList: run the log command in the correct directory when available 2009-09-13 16:55:20 +02:00
Pieter de Bie 8ae2cde437 GitRevList: Always run --children
It's very difficult to determine whether or not we have a path specifier.
Because it's so difficult, it's better to just always run --children. A quick
test indicates that it doesn't matter much in run-time, and it's better to be
conservative in what we accept than to show bogus lines because the children
haven't been rewritten.
2009-09-13 16:55:20 +02:00
Pieter de Bie 86ea9b5469 GitRevList: replace 'id' with PBGitRepository 2009-09-13 16:55:20 +02:00
Pieter de Bie d59745294d CLIProxy: pass on the directory in which the gitx command is run 2009-09-13 16:55:20 +02:00
Pieter de Bie 95a9cc81fc RevSpecifier: Add support for a working directory
This indicates the directory in which the Revparameters should be run,
useful when the parameters are requested from the CLI
2009-09-13 16:55:20 +02:00
Johannes Gilger 4544816ac8 GitX.css: Set a default-font for body
Some people have had Serif-fonts in their interface where no specific
fonts for classes/ids were specified. This sets the default-font to
'Lucida Grande' in order to have a nice non-serif on any system.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-09 23:03:03 +02:00
Johannes Gilger b7945b05e9 UserManual: Clarify double-click in stage-lines
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-09 10:19:33 +02:00
Pieter de Bie ff5388cc24 HistoryView: Remove focus border
That's so 1999!
2009-09-08 16:42:55 +02:00
Pieter de Bie 53ca665271 Delete this test file.
I don't think we need it anymore. Otherwise, we can alway
get it back.
2009-09-08 15:53:43 +02:00
Pieter de Bie b6575d9dba Update site to mention git v1.6.0 requirement' 2009-09-08 15:19:04 +02:00
Johannes Gilger 3a1b10ae8f PBGitTree: Improve binary-file decision
This uses the same mechanisms as git to determine whether a file is
binary: By simply searching the first 8000 bytes for a 0-byte. This
gets rid of the call to "file" and is a much cleaner and shorter
implementation.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-08 15:13:13 +02:00
Pieter de Bie 3861deecfa Require Git 1.6.0 or higher
Git 1.6.0 was released over a year ago now, so it shouldn't be too hard
to get people to upgrade to that. We need 1.6.0 for the --children revlist
option.

Requiring Git 1.6.0 or higher means we can also revert
a94981f35 (RevList: Don't rely on the presence of %x00) sometime.
2009-09-08 00:06:57 +02:00
Pieter de Bie c95a22acc3 Add a link to the user survey v0.7 2009-09-07 15:22:24 +02:00
Johannes Gilger 8243cf58b3 PBGitTree: Don't try to print binary-file contents
This patch prevents the plaintext display of files with binary content
in tree-view by connecting the content to the textContents attribute.

PBGitTree is extended with the method textContents, which returns the
textual representation of a PBGitTree-object. The methods first checks
the output of "git check-attr binary <file>" to see if the user
set/unset the binary attribute manually. Then it checks for common
binary file-extensions. If this method can't determine whether the file
is binary, the file-content is loaded and Unix "file" is run on the
first 100 bytes of the file to make a decision.

It also adds the -[PBGitTree fileSize] method to check the size
of the file before actually loading its contents.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
Edited-by: Pieter de Bie <pdebie@ai.rug.nl>
2009-09-07 14:38:44 +02:00
Johannes Gilger 8750060621 Site: Get rid of auto-refresh description
Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-07 14:35:39 +02:00
Pieter de Bie 6f18d9457a Add a few more release points 2009-09-07 13:44:24 +02:00
Stonewall Ballard 85322728fa Add preferences for opening things at launch.
Heavily-Edited-By: Pieter de Bie <pdebie@ai.rug.nl>
2009-09-07 13:37:17 +02:00
Pieter de Bie ed4bb78706 Merge branch 'pu/jg/docs'
* pu/jg/docs:
  Update releasenotes, as autorefresh won't make it into 0.7
  ReleaseNotes for v0.7 with author information
  Site: W3C-Valid and CSS/HTML corrections
  UserManual: Rewrite most parts for GitX 0.7
  GitX 0.7 Release-Notes
  UserManual: Add disclaimer as to what GitX is

Conflicts:
	Site/UserManual/text/01 - Introduction.markdown
2009-09-07 12:58:25 +02:00
Pieter de Bie 6515624267 Update releasenotes, as autorefresh won't make it into 0.7 2009-09-07 12:55:50 +02:00
Johannes Gilger 6b56919b31 ReleaseNotes for v0.7 with author information
Include Dave's reload feature and author-information for the most
important parts. Also a list of contributors since v0.6.3 from the
shortlog.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-06 15:00:09 +02:00
Pieter de Bie 26c3cd1f48 HistoryView: Add "SHA" Column and make it hidden by default 2009-09-06 14:46:58 +02:00
Johannes Gilger 788cd7163b Site: W3C-Valid and CSS/HTML corrections
* Makes all the pages (except "See it") W3C Valid
* Adjusts a few texts here and there a little bit
* Makes the menubar span the whole div and display correct on FF/Linux
* Moves "GitX" in the header a few px down to center it

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-06 14:38:48 +02:00
Pieter de Bie 5fc59901c0 Merge branch 'pu/jg/describe'
* pu/jg/describe:
  About-Panel: Show git-describe using Info.plist
2009-09-06 13:24:01 +02:00
Johannes Gilger 0b81911d76 About-Panel: Show git-describe using Info.plist
This patch adds a CFBundleGitRevision key to Info.plist which is set to
the output of "git describe" when building.

The menu-entry for "About GitX" was reconnected to a custom method in
the AppController, which reads the CF-string from the .plist and also
indicates if the build is a DEBUG-build.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-06 13:23:38 +02:00
Johannes Gilger 9d2efb1bb6 UserManual: Rewrite most parts for GitX 0.7
This rewrites most of the UserManual for GitX 0.7 and also updates the
screenshots to reflect the latest GitX-version.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-06 12:20:52 +02:00
Johannes Gilger b86d2c480f UserManual: Add disclaimer as to what GitX is
Add a disclaimer about the intended use of GitX. A lot of people seem to
think GitX is a way to make using a complex system easy. Other think
that they can learn git by clicking their way around GitX.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 16:04:52 +02:00
Johannes Gilger 8b74bc04f5 GitX 0.7 Release-Notes
This prepares the GitX 0.7 release-notes and also fixes two small bugs
in the previous notes.

It also fixes a CSS-bug which makes the gitx-website display the same
font with Firefox and Safari instead of using a serif with FF.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 15:47:26 +02:00
Johannes Gilger 1f7a818743 UserManual: Add disclaimer as to what GitX is
Add a disclaimer about the intended use of GitX. A lot of people seem to
think GitX is a way to make using a complex system easy. Other think
that they can learn git by clicking their way around GitX.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 15:47:20 +02:00
Johannes Gilger 8cdb2e6c9d Add empty line at end of previous release notes 2009-09-03 10:22:29 +02:00
Johannes Gilger 4e2b0535d4 This fixes a CSS-bug which makes the gitx-website display the same
font with Firefox and Safari instead of using a serif with FF.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 10:21:36 +02:00
Johannes Gilger d3cb020598 commit.js: Fix discardHunk functionality
When rewriting big parts of commit.js, JD forgot to use the new function
for the "Discard hunk" functionality as well. This fixes that.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 10:13:44 +02:00
Benjamin Kramer a8f4304f86 Fix checkbox scaling warnings
This fixes Snow Leopard's "The image scaling property should not be used with
checkboxes" warnings. Noticed by Stonewall Ballard.
2009-08-31 22:35:33 +02:00
Johannes Gilger 0823ff859d Keep window-title up-to-date in commit view
This issues a simple reloadRefs when refreshing the commit-view, keeping
the current branchname up-to-date here as well.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-08-31 12:17:17 +02:00
Pieter de Bie a5cfbe1b42 Merge commit '2f9ca38689cc5dff15d7e52af846f275c00295d2'
* commit '2f9ca38689cc5dff15d7e52af846f275c00295d2':
  Fix build with external build products directory
  Statusbar: Bring View-Mode buttons to front
2009-08-28 00:37:33 +02:00
Pieter de Bie 85fcee1710 DiffHighlighter: Remove weird end line
This was added in 1688c2a (diffHighlighter.js: Record the line index as attribute.),
I guess by accident
2009-08-28 00:34:30 +02:00
Pieter de Bie 64bc1f96ca IndexController: re-add ellipsis to "Discard Changes" menu item
This was accidentally deleted when I applied a patch from JS
2009-08-28 00:32:50 +02:00
Pieter de Bie 703782163d PBChangedFile: Add assert to make sure we're not doing something stupid 2009-08-28 00:31:42 +02:00
Pieter de Bie f9f6809c40 Also set blobMode / blobSha for unstaged changes.
It shouldn't matter if a file has staged / unstaged changes, as long as the
file is tracked, the SHA and blob should be recorded.

This had really annoying complications because PBChangedFile used this
information to decide whether or not to delete a file from the index
when unstaging in PBGitIndexController
2009-08-28 00:31:23 +02:00
Pieter de Bie 9320ef71a8 Merge branch 'js/selectable_hunk' of git://github.com/jdtsmith/gitx
* 'js/selectable_hunk' of git://github.com/jdtsmith/gitx:
  commit.js: Interface for selecting lines to (un-)stage.
  commit.js: Refactor hunk retrieval.
  diffHighlighter.js: Record the line index as attribute.
  commit view: Ensure buttons display on top of text
2009-08-28 00:18:23 +02:00
Benjamin Kramer 86f9adb6a0 Fix an obvious typo
Found by the clang static analyzer.
2009-08-28 00:15:01 +02:00
Gerd Knops 2f9ca38689 Fix build with external build products directory 2009-08-20 11:35:09 +02:00
Johannes Gilger 6af38e934a Statusbar: Bring View-Mode buttons to front
When resizing the GitX-window to small widths the buttons for switching
the view-mode would eventually "disappear" behind the label for loaded
commits. This fixes that behaviour, so that the buttons always go in
front of it, and therefore remain usable.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-08-19 13:01:31 +02:00
JD Smith ab47c14d6e commit.js: Interface for selecting lines to (un-)stage. 2009-07-08 17:22:09 -04:00