From: "Shawn O. Pearce" <spearce@spearce.org>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: Re: [EGIT PATCH 1/3] Support viewing all changes in a single compare editor
Date: Mon, 12 Jan 2009 08:54:35 -0800 [thread overview]
Message-ID: <20090112165435.GH10179@spearce.org> (raw)
In-Reply-To: <1231550077-1057-2-git-send-email-robin.rosenberg@dewire.com>
Robin Rosenberg <robin.rosenberg@dewire.com> wrote:
> Instead of having to click on every file listed as a diff
> an extra diff entry is inserted at the top. Double clicking
> on it will launch a compare editor for all changed files.
Nice.
> diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java
> index ebec261..7549aa4 100644
> --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java
> +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/CommitFileDiffViewer.java
> @@ -124,13 +149,16 @@ void doCopy() {
...
> + else
> + r.append(((RevDiff)o).left.getChildren().length + " files");
This should use the NLS framework for translation.
> diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java
> index 60b3a5a..c78ba6e 100644
> --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java
> +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FileDiffLabelProvider.java
> @@ -14,12 +14,49 @@
> class FileDiffLabelProvider extends BaseLabelProvider implements
...
> + StringBuilder b = new StringBuilder();
> + if (add > 0) {
> + b.append(add + " added");
> + }
> + if (mod > 0) {
> + if (b.length() > 0)
> + b.append(", ");
> + b.append(mod + " changed");
> + }
> + if (del > 0) {
> + if (b.length() > 0)
> + b.append(", ");
> + b.append(del + " deleted");
Again, NLS.
> diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java
> new file mode 100644
> index 0000000..020ec73
> --- /dev/null
> +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java
> +class DiffSide implements ITypedElement, IStructureComparator {
...
> + public String getName() {
> + return "EGit diff";
> + }
Should this have NLS applied to it?
--
Shawn.
prev parent reply other threads:[~2009-01-12 16:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-10 1:14 [EGIT PATCH 0/3] Show all changes files in the same compare editor Robin Rosenberg
2009-01-10 1:14 ` [EGIT PATCH 1/3] Support viewing all changes in a single " Robin Rosenberg
2009-01-10 1:14 ` [EGIT PATCH 2/3] Present type of change with file revision in diff viewer Robin Rosenberg
2009-01-10 1:14 ` [EGIT PATCH 3/3] Present full name of file revision Robin Rosenberg
2009-01-10 1:28 ` Robin Rosenberg
2009-01-12 16:54 ` Shawn O. Pearce [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090112165435.GH10179@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).