@@ -45,8 +45,8 @@ OpenIDE-Module-Name=Git OpenIDE-Module-Short-Description=Git Versioning System # Note: Changing the label below to &Git, breaks the app -CTL_Mercurial_MainMenu = &Git -CTL_Mercurial_DisplayName = Git +CTL_Git_MainMenu = &Git +CTL_Git_DisplayName = Git ## Annotator.java #{0} represents file name, {1} represents text annotations (branch name, status, etc.) src/org/netbeans/modules/git/Bundle.properties @@ -70,10 +70,10 @@ import org.openide.filesystems.Repository; */ class DiskMapTurboProvider implements TurboProvider { - static final String ATTR_STATUS_MAP = "mercurial.STATUS_MAP"; // NOI18N + static final String ATTR_STATUS_MAP = "git.STATUS_MAP"; // NOI18N private static final int STATUS_VALUABLE = FileInformation.STATUS_MANAGED & ~FileInformation.STATUS_VERSIONED_UPTODATE; - private static final String CACHE_DIRECTORY = "mercurialcache"; // NOI18N + private static final String CACHE_DIRECTORY = "gitcache"; // NOI18N private File cacheStore; private int storeSerial; src/org/netbeans/modules/git/DiskMapTurboProvider.java @@ -44,7 +44,8 @@ package org.netbeans.modules.git; import java.io.File; /** - * Holds detailed information about status of a mercurial-managed file, ie repository URL, remote path, branch, etc. + * Holds detailed information about status of a Git-managed file, + * i.e. Repository URL, remote path, branch, etc. * * @author Maros Sandor */ src/org/netbeans/modules/git/FileStatus.java @@ -106,12 +106,12 @@ public class FileStatusCache { private DiskMapTurboProvider cacheProvider; - private Git hg; + private Git git; private Set<FileSystem> filesystemsToRefresh; FileStatusCache() { - this.hg = Git.getInstance(); + this.git = Git.getInstance(); cacheProvider = new DiskMapTurboProvider(); turbo = Turbo.createCustom(new CustomProviders() { private final Set providers = Collections.singleton(cacheProvider); @@ -280,7 +280,7 @@ public class FileStatusCache { * @see FileInformation */ public FileInformation getStatus(File file) { - if (file.isDirectory() && (hg.isAdministrative(file) || GitUtils.isIgnored(file))) + if (file.isDirectory() && (git.isAdministrative(file) || GitUtils.isIgnored(file))) return FileStatusCache.FILE_INFORMATION_EXCLUDED_DIRECTORY; File dir = file.getParentFile(); if (dir == null) { @@ -317,7 +317,7 @@ public class FileStatusCache { if( fi != null) return fi; if (file.isDirectory()) { - if (hg.isAdministrative(file) || GitUtils.isIgnored(file, bCheckSharability)) { + if (git.isAdministrative(file) || GitUtils.isIgnored(file, bCheckSharability)) { return FileStatusCache.FILE_INFORMATION_EXCLUDED_DIRECTORY; } else { return FileStatusCache.FILE_INFORMATION_UPTODATE_DIRECTORY; @@ -383,10 +383,10 @@ public class FileStatusCache { Git.LOG.log(Level.FINE, "createFileInformation(): {0} {1}", new Object[] {file, callStatus}); // NOI18N if (file == null) return FILE_INFORMATION_UNKNOWN; - if (hg.isAdministrative(file)) + if (git.isAdministrative(file)) return FILE_INFORMATION_EXCLUDED_DIRECTORY; // Excluded - File rootManagedFolder = hg.getTopmostManagedParent(file); + File rootManagedFolder = git.getTopmostManagedParent(file); if (rootManagedFolder == null) return FILE_INFORMATION_UNKNOWN; // Avoiding returning NOT_MANAGED dir or file @@ -704,17 +704,17 @@ public class FileStatusCache { Map<File, FileInformation> folderFiles = new HashMap<File, FileInformation>(files.length); Git.LOG.log(Level.FINE, "scanFolder(): {0}", dir); // NOI18N - if (hg.isAdministrative(dir)) { + if (git.isAdministrative(dir)) { folderFiles.put(dir, FILE_INFORMATION_EXCLUDED_DIRECTORY); // Excluded dir return folderFiles; } - File rootManagedFolder = hg.getTopmostManagedParent(dir); + File rootManagedFolder = git.getTopmostManagedParent(dir); if (rootManagedFolder == null){ - // Only interested in looking for Hg managed dirs + // Only interested in looking for Git managed dirs for (File file : files) { - if (file.isDirectory() && hg.getTopmostManagedParent(file) != null){ - if (hg.isAdministrative(file) || GitUtils.isIgnored(file)){ + if (file.isDirectory() && git.getTopmostManagedParent(file) != null){ + if (git.isAdministrative(file) || GitUtils.isIgnored(file)){ Git.LOG.log(Level.FINE, "scanFolder NotMng Ignored Dir {0}: exclude SubDir: {1}", // NOI18N new Object[]{dir.getAbsolutePath(), file.getName()}); folderFiles.put(file, FILE_INFORMATION_EXCLUDED_DIRECTORY); // Excluded dir @@ -733,7 +733,7 @@ public class FileStatusCache { boolean bInIgnoredDir = GitUtils.isIgnored(dir); if(bInIgnoredDir){ for (File file : files) { - if (GitUtils.isPartOfMercurialMetadata(file)) continue; + if (GitUtils.isPartOfGitMetadata(file)) continue; if (file.isDirectory()) { folderFiles.put(file, FILE_INFORMATION_EXCLUDED_DIRECTORY); // Excluded dir @@ -763,10 +763,10 @@ public class FileStatusCache { if (interestingFiles == null) return folderFiles; for (File file : files) { - if (GitUtils.isPartOfMercurialMetadata(file)) continue; + if (GitUtils.isPartOfGitMetadata(file)) continue; if (file.isDirectory()) { - if (hg.isAdministrative(file) || GitUtils.isIgnored(file)) { + if (git.isAdministrative(file) || GitUtils.isIgnored(file)) { Git.LOG.log(Level.FINE, "scanFolder Mng Dir {0}: exclude Dir: {1}", // NOI18N new Object[]{dir.getAbsolutePath(), file.getName()}); folderFiles.put(file, FILE_INFORMATION_EXCLUDED_DIRECTORY); // Excluded dir @@ -778,7 +778,7 @@ public class FileStatusCache { } else { FileInformation fi = interestingFiles.get(file); if (fi == null) { - // We have removed -i from HgCommand.getInterestingFiles + // We have removed -i from GitCommand.getInterestingFiles // so we might have a file we should be ignoring fi = createFileInformation(file, false); } src/org/netbeans/modules/git/FileStatusCache.java @@ -72,7 +72,7 @@ import org.openide.util.RequestProcessor; */ public class Git { - public static final String GIT_OUTPUT_TAB_TITLE = org.openide.util.NbBundle.getMessage(Git.class, "CTL_Mercurial_DisplayName"); // NOI18N + public static final String GIT_OUTPUT_TAB_TITLE = org.openide.util.NbBundle.getMessage(Git.class, "CTL_Git_DisplayName"); // NOI18N public static final String CHANGESET_STR = "changeset:"; // NOI18N //public static final int GIT_FETCH_20_REVISIONS = 20; @@ -243,7 +243,7 @@ public class Git { } public File getTopmostManagedParent(File file) { - if (GitUtils.isPartOfMercurialMetadata(file)) { + if (GitUtils.isPartOfGitMetadata(file)) { for (;file != null; file = file.getParentFile()) { if (isAdministrative(file)) { file = file.getParentFile(); @@ -374,7 +374,7 @@ public class Git { RequestProcessor rp = processorsToUrl.get(key); if(rp == null) { - rp = new RequestProcessor("Mercurial - " + key, 1, true); // NOI18N + rp = new RequestProcessor("Git - " + key, 1, true); // NOI18N processorsToUrl.put(key, rp); } return rp; @@ -388,7 +388,7 @@ public class Git { /** * - * @param repositoryRoot String of Mercurial repository so that logger writes to correct output tab. Can be null + * @param repositoryRoot String of Git repository so that logger writes to correct output tab. Can be null * in which case the logger will not print anything * @return OutputLogger logger to write to */ src/org/netbeans/modules/git/Git.java @@ -184,7 +184,7 @@ public class GitAnnotator extends VCSAnnotator { } private void initDefaultColor(String name) { - String color = System.getProperty("hg.color." + name); // NOI18N + String color = System.getProperty("git.color." + name); // NOI18N if (color == null) return; setAnnotationColor(name, color); } @@ -302,7 +302,7 @@ public class GitAnnotator extends VCSAnnotator { if (info.isDirectory()) continue; int status = info.getStatus(); if (status == FileInformation.STATUS_VERSIONED_CONFLICT) { - Image badge = Utilities.loadImage("org/netbeans/modules/mercurial/resources/icons/conflicts-badge.png", true); // NOI18N + Image badge = Utilities.loadImage("org/netbeans/modules/git/resources/icons/conflicts-badge.png", true); // NOI18N return Utilities.mergeImages(icon, badge, 16, 9); } modified = true; @@ -319,7 +319,7 @@ public class GitAnnotator extends VCSAnnotator { continue; } if (status == FileInformation.STATUS_VERSIONED_CONFLICT) { - Image badge = Utilities.loadImage("org/netbeans/modules/mercurial/resources/icons/conflicts-badge.png", true); // NOI18N + Image badge = Utilities.loadImage("org/netbeans/modules/git/resources/icons/conflicts-badge.png", true); // NOI18N return Utilities.mergeImages(icon, badge, 16, 9); } modified = true; @@ -330,7 +330,7 @@ public class GitAnnotator extends VCSAnnotator { } if (modified && !allExcluded) { - Image badge = Utilities.loadImage("org/netbeans/modules/mercurial/resources/icons/modified-badge.png", true); // NOI18N + Image badge = Utilities.loadImage("org/netbeans/modules/git/resources/icons/modified-badge.png", true); // NOI18N return Utilities.mergeImages(icon, badge, 16, 9); } else { return null; @@ -506,7 +506,7 @@ public class GitAnnotator extends VCSAnnotator { } public String annotateNameHtml(String name, FileInformation mostImportantInfo, File mostImportantFile) { - // Hg: The codes used to show the status of files are: + // Git: The codes used to show the status of files are: // M = modified // A = added // R = removed src/org/netbeans/modules/git/GitAnnotator.java @@ -72,7 +72,7 @@ public class GitInterceptor extends VCSInterceptor { private RequestProcessor.Task refreshTask; - private static final RequestProcessor rp = new RequestProcessor("MercurialRefresh", 1, true); + private static final RequestProcessor rp = new RequestProcessor("GitRefresh", 1, true); public GitInterceptor() { cache = Git.getInstance().getFileStatusCache(); @@ -82,7 +82,7 @@ public class GitInterceptor extends VCSInterceptor { @Override public boolean beforeDelete(File file) { if (file == null) return true; - if (GitUtils.isPartOfMercurialMetadata(file)) return false; + if (GitUtils.isPartOfGitMetadata(file)) return false; // We track the deletion of top level directories if (file.isDirectory()) { @@ -114,11 +114,11 @@ public class GitInterceptor extends VCSInterceptor { private void fileDeletedImpl(final File file) { if (file == null) return; - Git hg = Git.getInstance(); - final File root = hg.getTopmostManagedParent(file); + Git git = Git.getInstance(); + final File root = git.getTopmostManagedParent(file); RequestProcessor rp = null; if (root != null) { - rp = hg.getRequestProcessor(root.getAbsolutePath()); + rp = git.getRequestProcessor(root.getAbsolutePath()); } if (file.exists()) { if (file.isDirectory()) { @@ -159,7 +159,7 @@ public class GitInterceptor extends VCSInterceptor { org.openide.util.NbBundle.getMessage(GitInterceptor.class, "MSG_Remove_Progress")); // NOI18N } else { // If we are deleting a parent directory of this file - // skip the call to hg remove as we will do it for the directory + // skip the call to git remove as we will do it for the directory file.delete(); if (root == null) return; for (File dir : dirsToDelete.keySet()) { @@ -189,9 +189,9 @@ public class GitInterceptor extends VCSInterceptor { public boolean beforeMove(File from, File to) { if (from == null || to == null || to.exists()) return true; - Git hg = Git.getInstance(); - if (hg.isManaged(from)) { - return hg.isManaged(to); + Git git = Git.getInstance(); + if (git.isManaged(from)) { + return git.isManaged(to); } return super.beforeMove(from, to); } @@ -207,7 +207,7 @@ public class GitInterceptor extends VCSInterceptor { Runnable outOfAwt = new Runnable() { public void run() { try { - hgMoveImplementation(from, to); + gitMoveImplementation(from, to); } catch (Throwable t) { innerT[0] = t; } @@ -230,18 +230,18 @@ public class GitInterceptor extends VCSInterceptor { // end of hack } else { - hgMoveImplementation(from, to); + gitMoveImplementation(from, to); } } - private void hgMoveImplementation(final File srcFile, final File dstFile) throws IOException { - final Git hg = Git.getInstance(); - final File root = hg.getTopmostManagedParent(srcFile); + private void gitMoveImplementation(final File srcFile, final File dstFile) throws IOException { + final Git git = Git.getInstance(); + final File root = git.getTopmostManagedParent(srcFile); if (root == null) return; - RequestProcessor rp = hg.getRequestProcessor(root.getAbsolutePath()); + RequestProcessor rp = git.getRequestProcessor(root.getAbsolutePath()); - Git.LOG.log(Level.FINE, "hgMoveImplementation(): File: {0} {1}", new Object[] {srcFile, dstFile}); // NOI18N + Git.LOG.log(Level.FINE, "gitMoveImplementation(): File: {0} {1}", new Object[] {srcFile, dstFile}); // NOI18N srcFile.renameTo(dstFile); Runnable moveImpl = new Runnable() { @@ -253,7 +253,7 @@ public class GitInterceptor extends VCSInterceptor { return; } int status = GitCommand.getSingleStatus(root, srcFile.getParent(), srcFile.getName()).getStatus(); - Git.LOG.log(Level.FINE, "hgMoveImplementation(): Status: {0} {1}", new Object[] {srcFile, status}); // NOI18N + Git.LOG.log(Level.FINE, "gitMoveImplementation(): Status: {0} {1}", new Object[] {srcFile, status}); // NOI18N if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY || status == FileInformation.STATUS_NOTVERSIONED_EXCLUDED) { } else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) { @@ -263,7 +263,7 @@ public class GitInterceptor extends VCSInterceptor { GitCommand.doRenameAfter(root, srcFile, dstFile, logger); } } catch (GitException e) { - Git.LOG.log(Level.FINE, "Mercurial failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N + Git.LOG.log(Level.FINE, "Git failed to rename: File: {0} {1}", new Object[] {srcFile.getAbsolutePath(), dstFile.getAbsolutePath()}); // NOI18N } finally { logger.closeLog(); } @@ -285,11 +285,11 @@ public class GitInterceptor extends VCSInterceptor { private void fileMovedImpl(final File from, final File to) { if (from == null || to == null || !to.exists()) return; if (to.isDirectory()) return; - Git hg = Git.getInstance(); - final File root = hg.getTopmostManagedParent(from); + Git git = Git.getInstance(); + final File root = git.getTopmostManagedParent(from); if (root == null) return; - RequestProcessor rp = hg.getRequestProcessor(root.getAbsolutePath()); + RequestProcessor rp = git.getRequestProcessor(root.getAbsolutePath()); GitProgressSupport supportCreate = new GitProgressSupport() { public void perform() { @@ -323,11 +323,11 @@ public class GitInterceptor extends VCSInterceptor { private void fileCreatedImpl(final File file) { if (file.isDirectory()) return; - Git hg = Git.getInstance(); - final File root = hg.getTopmostManagedParent(file); + Git git = Git.getInstance(); + final File root = git.getTopmostManagedParent(file); if (root == null) return; - RequestProcessor rp = hg.getRequestProcessor(root.getAbsolutePath()); + RequestProcessor rp = git.getRequestProcessor(root.getAbsolutePath()); GitProgressSupport supportCreate = new GitProgressSupport() { public void perform() { @@ -353,11 +353,11 @@ public class GitInterceptor extends VCSInterceptor { private void fileChangedImpl(final File file) { if (file.isDirectory()) return; - Git hg = Git.getInstance(); - final File root = hg.getTopmostManagedParent(file); + Git git = Git.getInstance(); + final File root = git.getTopmostManagedParent(file); if (root == null) return; - RequestProcessor rp = hg.getRequestProcessor(root.getAbsolutePath()); + RequestProcessor rp = git.getRequestProcessor(root.getAbsolutePath()); GitProgressSupport supportCreate = new GitProgressSupport() { public void perform() { src/org/netbeans/modules/git/GitInterceptor.java @@ -192,8 +192,7 @@ public class GitModuleConfig { } /** - * This method returns the username specified in $HOME/.hgrc - * or /etc/mercurial/hgrc + * This method returns the username specified in $HOME/.gitconfig * or a default username if none is found. */ public String getUserName() { @@ -211,8 +210,8 @@ public class GitModuleConfig { return userName; } - public void addHgkExtension() { - GitConfigFiles.getInstance().setProperty("hgext.hgk", ""); + public void addGitkExtension() { + GitConfigFiles.getInstance().setProperty("XXXXX", ""); } public void setUserName(String name) { src/org/netbeans/modules/git/GitModuleConfig.java @@ -58,8 +58,8 @@ import org.netbeans.spi.queries.CollocationQueryImplementation; public class GitVCS extends VersioningSystem implements PropertyChangeListener, CollocationQueryImplementation { public GitVCS() { - putProperty(PROP_DISPLAY_NAME, org.openide.util.NbBundle.getMessage(GitVCS.class, "CTL_Mercurial_DisplayName")); // NOI18N - putProperty(PROP_MENU_LABEL, org.openide.util.NbBundle.getMessage(GitVCS.class, "CTL_Mercurial_MainMenu")); // NOI18N + putProperty(PROP_DISPLAY_NAME, org.openide.util.NbBundle.getMessage(GitVCS.class, "CTL_Git_DisplayName")); // NOI18N + putProperty(PROP_MENU_LABEL, org.openide.util.NbBundle.getMessage(GitVCS.class, "CTL_Git_MainMenu")); // NOI18N Git.getInstance().addPropertyChangeListener(this); Git.getInstance().getFileStatusCache().addPropertyChangeListener(this); src/org/netbeans/modules/git/GitVCS.java @@ -62,7 +62,7 @@ public class OutputLogger { private InputOutput log; private boolean ignoreCommand = false; private String repositoryRootString; - private static final RequestProcessor rp = new RequestProcessor("MercurialOutput", 1); + private static final RequestProcessor rp = new RequestProcessor("GitOutput", 1); public static final int MAX_LINES_TO_PRINT = 500; private static final String MSG_TOO_MANY_LINES = "The number of output lines is greater than 500; see message log for complete output"; src/org/netbeans/modules/git/OutputLogger.java @@ -58,50 +58,50 @@ import org.openide.util.Utilities; /** * - * Handles the Git <b>hgrc</b> configuration file.</br> + * Handles the <b>.gitconfig</b> configuration file.</br> * * @author Padraig O'Briain */ public class GitConfigFiles { - public static final String HG_EXTENSIONS = "extensions"; // NOI18N - public static final String HG_EXTENSIONS_HGK = "hgext.hgk"; // NOI18N - public static final String HG_EXTENSIONS_FETCH = "fetch"; // NOI18N - public static final String HG_UI_SECTION = "ui"; // NOI18N - public static final String HG_USERNAME = "username"; // NOI18N - public static final String HG_PATHS_SECTION = "paths"; // NOI18N - public static final String HG_DEFAULT_PUSH = "default-push"; // NOI18N - public static final String HG_DEFAULT_PUSH_VALUE = "default-push"; // NOI18N - public static final String HG_DEFAULT_PULL = "default-pull"; // NOI18N - public static final String HG_DEFAULT_PULL_VALUE = "default"; // NOI18N + public static final String GIT_EXTENSIONS = "extensions"; // NOI18N + public static final String GIT_EXTENSIONS_GITK = "gitk"; // NOI18N + public static final String GIT_EXTENSIONS_FETCH = "fetch"; // NOI18N + public static final String GIT_UI_SECTION = "ui"; // NOI18N + public static final String GIT_USERNAME = "username"; // NOI18N + public static final String GIT_PATHS_SECTION = "paths"; // NOI18N + public static final String GIT_DEFAULT_PUSH = "default-push"; // NOI18N + public static final String GIT_DEFAULT_PUSH_VALUE = "default-push"; // NOI18N + public static final String GIT_DEFAULT_PULL = "default-pull"; // NOI18N + public static final String GIT_DEFAULT_PULL_VALUE = "default"; // NOI18N - /** The HgConfigFiles instance for user and system defaults */ + /** The GitConfigFiles instance for user and system defaults */ private static GitConfigFiles instance; - /** the Ini instance holding the configuration values stored in the <b>hgrc</b> - * file used by the Mercurial module */ - private Ini hgrc = null; + /** the Ini instance holding the configuration values stored in the <b>gitconfig</b> + * file used by the Git module */ + private Ini gitConfig = null; /** The repository directory if this instance is for a repository */ private File dir; private static final String WINDOWS_USER_APPDATA = getAPPDATA(); - private static final String WINDOWS_CONFIG_DIR = WINDOWS_USER_APPDATA + "\\Mercurial"; // NOI18N - private static final String WINDOWS_GLOBAL_CONFIG_DIR = getGlobalAPPDATA() + "\\Mercurial"; // NOI18N - public static final String HG_RC_FILE = "hgrc"; // NOI18N - public static final String HG_REPO_DIR = ".hg"; // NOI18N + private static final String WINDOWS_CONFIG_DIR = WINDOWS_USER_APPDATA + "\\Git"; // NOI18N + private static final String WINDOWS_GLOBAL_CONFIG_DIR = getGlobalAPPDATA() + "\\Git"; // NOI18N + public static final String GITCONFIG_FILE = "gitconfig"; // NOI18N + public static final String GIT_REPO_DIR = ".git"; // NOI18N /** * Creates a new instance */ private GitConfigFiles() { - // get the system hgrc file - hgrc = loadFile(HG_RC_FILE); + // get the system gitconfig file + gitConfig = loadFile(GITCONFIG_FILE); } /** * Returns a singleton instance * - * @return the HgConfiles instance + * @return the GitConfigFiles instance */ public static GitConfigFiles getInstance() { if (instance == null) { @@ -112,25 +112,25 @@ public class GitConfigFiles { public GitConfigFiles(File file) { dir = file; - hgrc = loadFile(file, HG_RC_FILE); + gitConfig = loadFile(file, GITCONFIG_FILE); } public void setProperty(String name, String value) { - if (name.equals(HG_USERNAME)) { - setProperty(HG_UI_SECTION, HG_USERNAME, value); - } else if (name.equals(HG_DEFAULT_PUSH)) { - setProperty(HG_PATHS_SECTION, HG_DEFAULT_PUSH_VALUE, value); - } else if (name.equals(HG_DEFAULT_PULL)) { - setProperty(HG_PATHS_SECTION, HG_DEFAULT_PULL_VALUE, value); - } else if (name.equals(HG_EXTENSIONS_HGK)) { - // Allow hgext.hgk to be set to some other user defined value if required - if(getProperty(HG_EXTENSIONS, HG_EXTENSIONS_HGK).equals("")){ - setProperty(HG_EXTENSIONS, HG_EXTENSIONS_HGK, value, true); + if (name.equals(GIT_USERNAME)) { + setProperty(GIT_UI_SECTION, GIT_USERNAME, value); + } else if (name.equals(GIT_DEFAULT_PUSH)) { + setProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PUSH_VALUE, value); + } else if (name.equals(GIT_DEFAULT_PULL)) { + setProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PULL_VALUE, value); + } else if (name.equals(GIT_EXTENSIONS_GITK)) { + + if(getProperty(GIT_EXTENSIONS, GIT_EXTENSIONS_GITK).equals("")){ + setProperty(GIT_EXTENSIONS, GIT_EXTENSIONS_GITK, value, true); } - } else if (name.equals(HG_EXTENSIONS_FETCH)) { + } else if (name.equals(GIT_EXTENSIONS_FETCH)) { // Allow fetch to be set to some other user defined value if required - if(getProperty(HG_EXTENSIONS, HG_EXTENSIONS_FETCH).equals("")){ - setProperty(HG_EXTENSIONS, HG_EXTENSIONS_FETCH, value, true); + if(getProperty(GIT_EXTENSIONS, GIT_EXTENSIONS_FETCH).equals("")){ + setProperty(GIT_EXTENSIONS, GIT_EXTENSIONS_FETCH, value, true); } } @@ -141,14 +141,14 @@ public class GitConfigFiles { if (value.length() == 0) { removeProperty(section, name); } else { - Ini.Section inisection = getSection(hgrc, section, true); + Ini.Section inisection = getSection(gitConfig, section, true); inisection.put(name, value); } } else { - Ini.Section inisection = getSection(hgrc, section, true); + Ini.Section inisection = getSection(gitConfig, section, true); inisection.put(name, value); } - storeIni(hgrc, HG_RC_FILE); + storeIni(gitConfig, GITCONFIG_FILE); } public void setProperty(String section, String name, String value) { @@ -156,7 +156,7 @@ public class GitConfigFiles { } public void setUserName(String value) { - setProperty(HG_UI_SECTION, HG_USERNAME, value); + setProperty(GIT_UI_SECTION, GIT_USERNAME, value); } public String getUserName() { @@ -164,7 +164,7 @@ public class GitConfigFiles { } public Properties getProperties(String section) { - Ini.Section inisection = getSection(hgrc, section, false); + Ini.Section inisection = getSection(gitConfig, section, false); Properties props = new Properties(); if (inisection != null) { Set<String> keys = inisection.keySet(); @@ -176,18 +176,18 @@ public class GitConfigFiles { } public void clearProperties(String section) { - Ini.Section inisection = getSection(hgrc, section, false); + Ini.Section inisection = getSection(gitConfig, section, false); if (inisection != null) { inisection.clear(); - storeIni(hgrc, HG_RC_FILE); + storeIni(gitConfig, GITCONFIG_FILE); } } public void removeProperty(String section, String name) { - Ini.Section inisection = getSection(hgrc, section, false); + Ini.Section inisection = getSection(gitConfig, section, false); if (inisection != null) { inisection.remove(name); - storeIni(hgrc, HG_RC_FILE); + storeIni(gitConfig, GITCONFIG_FILE); } } @@ -195,16 +195,16 @@ public class GitConfigFiles { if (reload) { doReload(); } - return getProperty(HG_PATHS_SECTION, HG_DEFAULT_PULL_VALUE); + return getProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PULL_VALUE); } public String getDefaultPush(Boolean reload) { if (reload) { doReload(); } - String value = getProperty(HG_PATHS_SECTION, HG_DEFAULT_PUSH); + String value = getProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PUSH); if (value.length() == 0) { - value = getProperty(HG_PATHS_SECTION, HG_DEFAULT_PULL_VALUE); + value = getProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PULL_VALUE); } return value; } @@ -213,25 +213,25 @@ public class GitConfigFiles { if (reload) { doReload(); } - return getProperty(HG_UI_SECTION, HG_USERNAME); + return getProperty(GIT_UI_SECTION, GIT_USERNAME); } public String getProperty(String section, String name) { - Ini.Section inisection = getSection(hgrc, section, true); + Ini.Section inisection = getSection(gitConfig, section, true); String value = inisection.get(name); return value != null ? value : ""; // NOI18N } public boolean containsProperty(String section, String name) { - Ini.Section inisection = getSection(hgrc, section, true); + Ini.Section inisection = getSection(gitConfig, section, true); return inisection.containsKey(name); } private void doReload () { if (dir == null) { - hgrc = loadFile(HG_RC_FILE); + gitConfig = loadFile(GITCONFIG_FILE); } else { - hgrc = loadFile(dir, HG_RC_FILE); + gitConfig = loadFile(dir, GITCONFIG_FILE); } } @@ -247,7 +247,7 @@ public class GitConfigFiles { try { String filePath; if (dir != null) { - filePath = dir.getAbsolutePath() + File.separator + HG_REPO_DIR + File.separator + iniFile; // NOI18N + filePath = dir.getAbsolutePath() + File.separator + GIT_REPO_DIR + File.separator + iniFile; // NOI18N } else { filePath = getUserConfigPath() + iniFile; } @@ -260,7 +260,7 @@ public class GitConfigFiles { } /** - * Returns the path for the Mercurial configuration directory + * Returns the path for the Git configuration directory * * @return the path * @@ -276,7 +276,7 @@ public class GitConfigFiles { } private Ini loadFile(File dir, String fileName) { - String filePath = dir.getAbsolutePath() + File.separator + HG_REPO_DIR + File.separator + fileName; // NOI18N + String filePath = dir.getAbsolutePath() + File.separator + GIT_REPO_DIR + File.separator + fileName; // NOI18N File file = FileUtil.normalizeFile(new File(filePath)); Ini system = null; try { @@ -289,7 +289,7 @@ public class GitConfigFiles { if(system == null) { system = new Ini(); - Git.LOG.log(Level.WARNING, "Could not load the file " + filePath + ". Falling back on hg defaults."); // NOI18N + Git.LOG.log(Level.WARNING, "Could not load the file " + filePath + ". Falling back on git defaults."); // NOI18N } return system; } @@ -297,8 +297,7 @@ public class GitConfigFiles { * Loads the configuration file * The settings are loaded and merged together in the folowing order: * <ol> - * <li> The per-user configuration file, i.e ~/.hgrc - * <li> The system-wide file, i.e. /etc/mercurial/hgrc + * <li> The per-user configuration file, i.e ~/.gitconfig * </ol> * * @param fileName the file name @@ -319,7 +318,7 @@ public class GitConfigFiles { if(system == null) { system = new Ini(); - Git.LOG.log(Level.WARNING, "Could not load the file " + filePath + ". Falling back on hg defaults."); // NOI18N + Git.LOG.log(Level.WARNING, "Could not load the file " + filePath + ". Falling back on git defaults."); // NOI18N } Ini global = null; @@ -368,7 +367,7 @@ public class GitConfigFiles { */ private static String getGlobalConfigPath () { if(Utilities.isUnix()) { - return "/etc/mercurial"; // NOI18N + return "/etc/gitconfig"; // NOI18N } else if (Utilities.isWindows()){ return WINDOWS_GLOBAL_CONFIG_DIR; } src/org/netbeans/modules/git/config/GitConfigFiles.java @@ -43,8 +43,8 @@ CTL_PropertiesDialog_Title=Git Extensions Editor CTL_Properties_Action_Cancel = Cancel CTL_Properties_Action_OK = OK -AdvancedOption_DisplayName_Mercurial=Git -AdvancedOption_Tooltip_Mercurial=Git Global Options +AdvancedOption_DisplayName_Git=Git +AdvancedOption_Tooltip_Git=Git Global Options GitPanel.jLabel1.text=Git &User Name\: GitPanel.jLabel3.text=(Changes will not take effect until the IDE is restarted.) @@ -59,7 +59,7 @@ Browse_title=Browse for the Git Executable ACSD_ExportBrowseFolder = Lets you browse for default export file ExportBrowse_title=Browse for Default ExportFile OK_Button=OK -MercurialExec=Folders +GitExec=Folders GitPanel.jPanel1.border.title=Git Status Labels @@ -76,7 +76,7 @@ GitPanel.label.status = stays for Status GitPanel.label.folder = stays for Branch or Tag Name MSG_STATUS_LABEL_WITH_REVSION_TITLE = Revision Label Performance -MSG_STATUS_LABEL_WITH_REVSION_MSG = Revision labels {revision} have been added.\n\nThis can seriously effect performance when viewing Mercurial controlled Projects.\nUsing Show Annotations or Show History on selected files is a more efficient way to get revision information. +MSG_STATUS_LABEL_WITH_REVSION_MSG = Revision labels {revision} have been added.\n\nThis can seriously effect performance when viewing Git controlled Projects.\nUsing Show Annotations or Show History on selected files is a more efficient way to get revision information. GitPanel.labelVariables.title=Select Variables src/org/netbeans/modules/git/options/Bundle.properties @@ -48,11 +48,11 @@ import org.openide.util.NbBundle; public final class GitAdvancedOption extends AdvancedOption { public String getDisplayName() { - return NbBundle.getMessage(GitAdvancedOption.class, "AdvancedOption_DisplayName_Mercurial"); // NOI18N + return NbBundle.getMessage(GitAdvancedOption.class, "AdvancedOption_DisplayName_Git"); // NOI18N } public String getTooltip() { - return NbBundle.getMessage(GitAdvancedOption.class, "AdvancedOption_Tooltip_Mercurial"); // NOI18N + return NbBundle.getMessage(GitAdvancedOption.class, "AdvancedOption_Tooltip_Git"); // NOI18N } public OptionsPanelController create() { src/org/netbeans/modules/git/options/GitAdvancedOption.java @@ -74,7 +74,7 @@ public class GitExtProperties implements ActionListener, DocumentListener { private File loadedValueFile; private Font fontTextArea; - /** Creates a new instance of HgExtProperties */ + /** Creates a new instance of GitExtProperties */ public GitExtProperties(PropertiesPanel panel, PropertiesTable propTable, File root) { this.panel = panel; this.propTable = propTable; @@ -146,17 +146,17 @@ public class GitExtProperties implements ActionListener, DocumentListener { support = new GitProgressSupport() { protected void perform() { Properties props = GitModuleConfig.getDefault().getProperties(root, "extensions"); // NOI18N - GitPropertiesNode[] hgProps = new GitPropertiesNode[props.size()]; + GitPropertiesNode[] gitProps = new GitPropertiesNode[props.size()]; int i = 0; for (Enumeration e = props.propertyNames(); e.hasMoreElements() ; ) { String name = (String) e.nextElement(); String tmp = props.getProperty(name); String value = tmp != null ? tmp : ""; // NOI18N - hgProps[i] = new GitPropertiesNode(name, value); + gitProps[i] = new GitPropertiesNode(name, value); i++; } - propTable.setNodes(hgProps); + propTable.setNodes(gitProps); } }; support.start(rp, null, org.openide.util.NbBundle.getMessage(GitExtProperties.class, "LBL_Properties_Progress")); // NOI18N @@ -166,21 +166,21 @@ public class GitExtProperties implements ActionListener, DocumentListener { } private boolean addProperty(String name, String value) { - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); - for (int i = 0; i < hgPropertiesNodes.length; i++) { - String hgPropertyName = hgPropertiesNodes[propTable.getModelIndex(i)].getName(); - if (hgPropertyName.equals(name)) { - hgPropertiesNodes[propTable.getModelIndex(i)].setValue(value); - propTable.setNodes(hgPropertiesNodes); + GitPropertiesNode[] gitPropertiesNode = propTable.getNodes(); + for (int i = 0; i < gitPropertiesNode.length; i++) { + String gitPropertyName = gitPropertiesNode[propTable.getModelIndex(i)].getName(); + if (gitPropertyName.equals(name)) { + gitPropertiesNode[propTable.getModelIndex(i)].setValue(value); + propTable.setNodes(gitPropertiesNode); return true; } } - GitPropertiesNode[] hgProps = new GitPropertiesNode[hgPropertiesNodes.length + 1]; - for (int i = 0; i < hgPropertiesNodes.length; i++) { - hgProps[i] = hgPropertiesNodes[i]; + GitPropertiesNode[] gitProps = new GitPropertiesNode[gitPropertiesNode.length + 1]; + for (int i = 0; i < gitPropertiesNode.length; i++) { + gitProps[i] = gitPropertiesNode[i]; } - hgProps[hgPropertiesNodes.length] = new GitPropertiesNode(name, value); - propTable.setNodes(hgProps); + gitProps[gitPropertiesNode.length] = new GitPropertiesNode(name, value); + propTable.setNodes(gitProps); return true; } @@ -197,11 +197,11 @@ public class GitExtProperties implements ActionListener, DocumentListener { support = new GitProgressSupport() { protected void perform() { GitModuleConfig.getDefault().clearProperties(root, "extensions"); // NOI18N - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); - for (int i = 0; i < hgPropertiesNodes.length; i++) { - String hgPropertyName = hgPropertiesNodes[propTable.getModelIndex(i)].getName(); - String hgPropertyValue = hgPropertiesNodes[propTable.getModelIndex(i)].getValue(); - GitModuleConfig.getDefault().setProperty(root, "extensions", hgPropertyName, hgPropertyValue, true); // NOI18N + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); + for (int i = 0; i < gitPropertiesNodes.length; i++) { + String gitPropertyName = gitPropertiesNodes[propTable.getModelIndex(i)].getName(); + String gitPropertyValue = gitPropertiesNodes[propTable.getModelIndex(i)].getValue(); + GitModuleConfig.getDefault().setProperty(root, "extensions", gitPropertyName, gitPropertyValue, true); // NOI18N } } }; @@ -215,18 +215,18 @@ public class GitExtProperties implements ActionListener, DocumentListener { final int[] rows = propTable.getSelectedItems(); // No rows selected if (rows.length == 0) return; - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); - GitPropertiesNode[] hgProps = new GitPropertiesNode[hgPropertiesNodes.length - rows.length]; + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); + GitPropertiesNode[] gitProps = new GitPropertiesNode[gitPropertiesNodes.length - rows.length]; int j = 0; int k = 0; - for (int i = 0; i < hgPropertiesNodes.length; i++) { + for (int i = 0; i < gitPropertiesNodes.length; i++) { if (i != rows[j]) { - hgProps[k++] = hgPropertiesNodes[i]; + gitProps[k++] = gitPropertiesNodes[i]; } else { if (j < rows.length - 1) j++; } } - propTable.setNodes(hgProps); + propTable.setNodes(gitProps); } public void insertUpdate(DocumentEvent event) { @@ -261,15 +261,15 @@ public class GitExtProperties implements ActionListener, DocumentListener { //super.mouseClicked(arg0); if (event.getClickCount() == 2) { int[] rows = propTable.getSelectedItems(); - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); - if (hgPropertiesNodes == null) + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); + if (gitPropertiesNodes == null) return; - final String hgPropertyName = hgPropertiesNodes[propTable.getModelIndex(rows[0])].getName(); - final String hgPropertyValue = hgPropertiesNodes[propTable.getModelIndex(rows[0])].getValue(); + final String gitPropertyName = gitPropertiesNodes[propTable.getModelIndex(rows[0])].getName(); + final String gitPropertyValue = gitPropertiesNodes[propTable.getModelIndex(rows[0])].getValue(); EventQueue.invokeLater(new Runnable() { public void run() { - panel.getComboName().getEditor().setItem(hgPropertyName); - panel.getTxtAreaValue().setText(hgPropertyValue); + panel.getComboName().getEditor().setItem(gitPropertyName); + panel.getTxtAreaValue().setText(gitPropertyValue); } }); } src/org/netbeans/modules/git/options/GitExtProperties.java @@ -81,7 +81,7 @@ final class GitOptionsPanelController extends OptionsPanelController implements panel.execPathBrowseButton.addActionListener(this); panel.exportFilenameBrowseButton.addActionListener(this); - String tooltip = NbBundle.getMessage(GitPanel.class, "MercurialPanel.annotationTextField.toolTipText", GitAnnotator.LABELS); // NOI18N + String tooltip = NbBundle.getMessage(GitPanel.class, "GitPanel.annotationTextField.toolTipText", GitAnnotator.LABELS); // NOI18N panel.annotationTextField.setToolTipText(tooltip); panel.addButton.addActionListener(this); @@ -206,7 +206,7 @@ final class GitOptionsPanelController extends OptionsPanelController implements return f.isDirectory(); } public String getDescription() { - return NbBundle.getMessage(GitOptionsPanelController.class, "MercurialExec");// NOI18N + return NbBundle.getMessage(GitOptionsPanelController.class, "GitExec");// NOI18N } }); fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); @@ -261,14 +261,14 @@ final class GitOptionsPanelController extends OptionsPanelController implements for (int i = 0; i < GitAnnotator.LABELS.length; i++) { LabelVariable variable = new LabelVariable( GitAnnotator.LABELS[i], - "{" + GitAnnotator.LABELS[i] + "} - " + NbBundle.getMessage(GitPanel.class, "MercurialPanel.label." + GitAnnotator.LABELS[i]) // NOI18N + "{" + GitAnnotator.LABELS[i] + "} - " + NbBundle.getMessage(GitPanel.class, "GitPanel.label." + GitAnnotator.LABELS[i]) // NOI18N ); variables.add(variable); } labelsPanel.labelsList.setListData(variables.toArray(new LabelVariable[variables.size()])); - String title = NbBundle.getMessage(GitPanel.class, "MercurialPanel.labelVariables.title"); // NOI18N - String acsd = NbBundle.getMessage(GitPanel.class, "MercurialPanel.labelVariables.acsd"); // NOI18N + String title = NbBundle.getMessage(GitPanel.class, "GitPanel.labelVariables.title"); // NOI18N + String acsd = NbBundle.getMessage(GitPanel.class, "GitPanel.labelVariables.acsd"); // NOI18N DialogDescriptor dialogDescriptor = new DialogDescriptor(labelsPanel, title); dialogDescriptor.setModal(true); @@ -329,7 +329,7 @@ final class GitOptionsPanelController extends OptionsPanelController implements panel.propsPanel.add(component, BorderLayout.CENTER); - GitExtProperties hgProperties = new GitExtProperties(panel, propTable, null) ; + GitExtProperties gitProperties = new GitExtProperties(panel, propTable, null) ; DialogDescriptor dd = new DialogDescriptor(panel, NbBundle.getMessage(GitOptionsPanelController.class, "CTL_PropertiesDialog_Title", null), true, null); // NOI18N final JButton okButton = new JButton(NbBundle.getMessage(GitOptionsPanelController.class, "CTL_Properties_Action_OK")); // NOI18N @@ -346,7 +346,7 @@ final class GitOptionsPanelController extends OptionsPanelController implements dialog.pack(); dialog.setVisible(true); if (dd.getValue() == okButton) { - hgProperties.setProperties(); + gitProperties.setProperties(); } } } \ No newline at end of file src/org/netbeans/modules/git/options/GitOptionsPanelController.java @@ -243,9 +243,9 @@ final class GitPanel extends javax.swing.JPanel { void load() { // TODO read settings and initialize GUI // Example: - // someCheckBox.setSelected(Preferences.userNodeForPackage(MercurialPanel.class).getBoolean("someFlag", false)); // NOI18N + // someCheckBox.setSelected(Preferences.userNodeForPackage(GitPanel.class).getBoolean("someFlag", false)); // NOI18N // or for org.openide.util with API spec. version >= 7.4: - // someCheckBox.setSelected(NbPreferences.forModule(MercurialPanel.class).getBoolean("someFlag", false)); // NOI18N + // someCheckBox.setSelected(NbPreferences.forModule(GitPanel.class).getBoolean("someFlag", false)); // NOI18N // or: // someTextField.setText(SomeSystemOption.getDefault().getSomeStringProperty()); userNameTextField.setText(GitModuleConfig.getDefault().getUserName()); @@ -258,9 +258,9 @@ final class GitPanel extends javax.swing.JPanel { void store() { // TODO store modified settings // Example: - // Preferences.userNodeForPackage(MercurialPanel.class).putBoolean("someFlag", someCheckBox.isSelected()); // NOI18N + // Preferences.userNodeForPackage(GitPanel.class).putBoolean("someFlag", someCheckBox.isSelected()); // NOI18N // or for org.openide.util with API spec. version >= 7.4: - // NbPreferences.forModule(MercurialPanel.class).putBoolean("someFlag", someCheckBox.isSelected()); // NOI18N + // NbPreferences.forModule(GitPanel.class).putBoolean("someFlag", someCheckBox.isSelected()); // NOI18N // or: // SomeSystemOption.getDefault().setSomeStringProperty(someTextField.getText()); GitModuleConfig.getDefault().setUserName(userNameTextField.getText()); src/org/netbeans/modules/git/options/GitPanel.java @@ -47,7 +47,7 @@ import org.netbeans.modules.git.Git; import org.openide.LifecycleManager; /** - * Base for all context-sensitive Mercurial actions. + * Base for all context-sensitive Git actions. * * @author Padraig O'Briain */ src/org/netbeans/modules/git/ui/actions/ContextAction.java @@ -746,7 +746,7 @@ final class AnnotationBar extends JComponent implements Accessible, PropertyChan try { escapedAuthor = XMLUtil.toElementContent(al.getAuthor()); } catch (CharConversionException e1) { - Git.LOG.log(Level.INFO, "HG.AB: can not HTML escape: ", al.getAuthor()); // NOI18N + Git.LOG.log(Level.INFO, "GIT.AB: can not HTML escape: ", al.getAuthor()); // NOI18N } // always return unique string to avoid tooltip sharing on mouse move over same revisions --> @@ -759,7 +759,7 @@ final class AnnotationBar extends JComponent implements Accessible, PropertyChan try { escaped = XMLUtil.toElementContent(al.getCommitMessage()); } catch (CharConversionException e1) { - Git.LOG.log(Level.INFO, "HG.AB: can not HTML escape: ", al.getCommitMessage()); // NOI18N + Git.LOG.log(Level.INFO, "GIT.AB: can not HTML escape: ", al.getCommitMessage()); // NOI18N } if (escaped != null) { String lined = escaped.replaceAll(System.getProperty("line.separator"), "<br>"); // NOI18N @@ -803,7 +803,7 @@ final class AnnotationBar extends JComponent implements Accessible, PropertyChan return al; } } catch (BadLocationException e) { - Git.LOG.log(Level.INFO, "HG.AB: can not locate line annotation."); // NOI18N + Git.LOG.log(Level.INFO, "GIT.AB: can not locate line annotation."); // NOI18N } } @@ -815,6 +815,7 @@ final class AnnotationBar extends JComponent implements Accessible, PropertyChan * It invokes {@link #paintView} that contains * actual business logic. */ + @Override public void paintComponent(Graphics g) { super.paintComponent(g); src/org/netbeans/modules/git/ui/annotate/AnnotationBar.java @@ -98,7 +98,7 @@ public class CloneAction extends ContextAction { String folderName = root.getName(); Boolean projIsRepos = true; if (!root.equals(projFile)) { - // Mercurial Repository is not the same as project root + // Git Repository is not the same as project root projIsRepos = false; } for(int i = 0; i < 10000; i++){ @@ -121,7 +121,7 @@ public class CloneAction extends ContextAction { private static void performClone(final String source, final String target, boolean projIsRepos, File projFile, final boolean isLocalClone, final String pullPath, final String pushPath) { - final Git hg = Git.getInstance(); + final Git git = Git.getInstance(); final ProjectManager projectManager = ProjectManager.getDefault(); final File prjFile = projFile; final Boolean prjIsRepos = projIsRepos; @@ -156,8 +156,8 @@ public class CloneAction extends ContextAction { prj = projectManager.findProject(cloneProj); if(prj != null){ GitProjectUtils.openProject(prj, this, GitModuleConfig.getDefault().getSetMainProject()); - hg.versionedFilesChanged(); - hg.refreshAllAnnotations(); + git.versionedFilesChanged(); + git.refreshAllAnnotations(); }else{ logger.outputInRed( NbBundle.getMessage(CloneAction.class, "MSG_EXTERNAL_CLONE_PRJ_NOT_FOUND_CANT_SETASMAIN")); // NOI18N @@ -220,18 +220,18 @@ public class CloneAction extends ContextAction { NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex); DialogDisplayer.getDefault().notifyLater(e); }finally { - // #125835 - Push to default was not being set automatically by hg after Clone - // but was after you opened the Mercurial -> Properties, inconsistent - GitConfigFiles hg = new GitConfigFiles(cloneFolder); - String defaultPull = hg.getDefaultPull(false); - String defaultPush = hg.getDefaultPush(false); + // #125835 - Push to default was not being set automatically by git after Clone + // but was after you opened the Git -> Properties, inconsistent + GitConfigFiles git = new GitConfigFiles(cloneFolder); + String defaultPull = git.getDefaultPull(false); + String defaultPush = git.getDefaultPush(false); if(pullPath != null && !pullPath.equals("")) defaultPull = pullPath; if(pushPath != null && !pushPath.equals("")) defaultPush = pushPath; - hg.setProperty(GitProperties.HGPROPNAME_DEFAULT_PULL, defaultPull); - hg.setProperty(GitProperties.HGPROPNAME_DEFAULT_PUSH, defaultPush); + git.setProperty(GitProperties.GITPROPNAME_DEFAULT_PULL, defaultPull); + git.setProperty(GitProperties.GITPROPNAME_DEFAULT_PUSH, defaultPush); //#121581: Work around for ini4j bug on Windows not handling single '\' correctly - // hg clone creates the default hgrc, we just overwrite it's contents with + // git clone creates the default gitconfig, we just overwrite it's contents with // default path contianing '\\' if(isLocalClone && Utilities.isWindows()){ fixLocalPullPushPathsOnWindows(cloneFolder.getAbsolutePath(), defaultPull, defaultPush); @@ -246,28 +246,29 @@ public class CloneAction extends ContextAction { support.start(rp, source, org.openide.util.NbBundle.getMessage(CloneAction.class, "LBL_Clone_Progress", source)); // NOI18N } + @Override public boolean isEnabled() { return GitUtils.getRootFile(context) != null; } - private static final String HG_PATHS_SECTION_ENCLOSED = "[" + GitConfigFiles.HG_PATHS_SECTION + "]";// NOI18N + private static final String GIT_PATHS_SECTION_ENCLOSED = "[" + GitConfigFiles.GIT_PATHS_SECTION + "]";// NOI18N private static void fixLocalPullPushPathsOnWindows(String root, String defaultPull, String defaultPush) { - File hgrcFile = null; + File gitConfigFile = null; File tempFile = null; BufferedReader br = null; PrintWriter pw = null; try { - hgrcFile = new File(root + File.separator + GitConfigFiles.HG_REPO_DIR, GitConfigFiles.HG_RC_FILE); - if (!hgrcFile.isFile() || !hgrcFile.canWrite()) return; + gitConfigFile = new File(root + File.separator + GitConfigFiles.GIT_REPO_DIR, GitConfigFiles.GITCONFIG_FILE); + if (!gitConfigFile.isFile() || !gitConfigFile.canWrite()) return; - String defaultPullWinStr = GitConfigFiles.HG_DEFAULT_PULL_VALUE + " = " + defaultPull.replace("\\", "\\\\") + "\n"; // NOI18N - String defaultPushWinStr = GitConfigFiles.HG_DEFAULT_PUSH_VALUE + " = " + defaultPush.replace("\\", "\\\\") + "\n"; // NOI18N + String defaultPullWinStr = GitConfigFiles.GIT_DEFAULT_PULL_VALUE + " = " + defaultPull.replace("\\", "\\\\") + "\n"; // NOI18N + String defaultPushWinStr = GitConfigFiles.GIT_DEFAULT_PUSH_VALUE + " = " + defaultPush.replace("\\", "\\\\") + "\n"; // NOI18N - tempFile = new File(hgrcFile.getAbsolutePath() + ".tmp"); // NOI18N + tempFile = new File(gitConfigFile.getAbsolutePath() + ".tmp"); // NOI18N if (tempFile == null) return; - br = new BufferedReader(new FileReader(hgrcFile)); + br = new BufferedReader(new FileReader(gitConfigFile)); pw = new PrintWriter(new FileWriter(tempFile)); String line = null; @@ -276,20 +277,20 @@ public class CloneAction extends ContextAction { boolean bPullDone = false; boolean bPushDone = false; while ((line = br.readLine()) != null) { - if (line.startsWith(HG_PATHS_SECTION_ENCLOSED)) { + if (line.startsWith(GIT_PATHS_SECTION_ENCLOSED)) { bInPaths = true; }else if (line.startsWith("[")) { // NOI18N bInPaths = false; } - if (bInPaths && !bPullDone && line.startsWith(GitConfigFiles.HG_DEFAULT_PULL_VALUE) && - !line.startsWith(GitConfigFiles.HG_DEFAULT_PUSH_VALUE)) { + if (bInPaths && !bPullDone && line.startsWith(GitConfigFiles.GIT_DEFAULT_PULL_VALUE) && + !line.startsWith(GitConfigFiles.GIT_DEFAULT_PUSH_VALUE)) { pw.println(defaultPullWinStr); bPullDone = true; - } else if (bInPaths && !bPullDone && line.startsWith(GitConfigFiles.HG_DEFAULT_PULL)) { + } else if (bInPaths && !bPullDone && line.startsWith(GitConfigFiles.GIT_DEFAULT_PULL)) { pw.println(defaultPullWinStr); bPullDone = true; - } else if (bInPaths && !bPushDone && line.startsWith(GitConfigFiles.HG_DEFAULT_PUSH_VALUE)) { + } else if (bInPaths && !bPushDone && line.startsWith(GitConfigFiles.GIT_DEFAULT_PUSH_VALUE)) { pw.println(defaultPushWinStr); bPushDone = true; } else { @@ -303,9 +304,9 @@ public class CloneAction extends ContextAction { try { if(pw != null) pw.close(); if(br != null) br.close(); - if(tempFile != null && tempFile.isFile() && tempFile.canWrite() && hgrcFile != null){ - hgrcFile.delete(); - tempFile.renameTo(hgrcFile); + if(tempFile != null && tempFile.isFile() && tempFile.canWrite() && gitConfigFile != null){ + gitConfigFile.delete(); + tempFile.renameTo(gitConfigFile); } } catch (IOException ex) { // Ignore src/org/netbeans/modules/git/ui/clone/CloneAction.java @@ -162,7 +162,7 @@ final class ProjectUtilities { // it happens for all apisupport projects unless // checked out into directory that contains nbbuild and openide folders // apisupport project is valid only if placed in defined directory structure - Throwable cause = new Throwable("HG.PU: ignoring suspicious project folder..."); // NOI18N + Throwable cause = new Throwable("GIT.PU: ignoring suspicious project folder..."); // NOI18N e.initCause(cause); Git.LOG.log(Level.INFO, null, e); } src/org/netbeans/modules/git/ui/clone/ProjectUtilities.java @@ -84,10 +84,9 @@ import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; - /** - * Commit action for mercurial: - * git commit - commit the specified files or all outstanding changes + * Commit action for Git: + * git commit - commit the specified files or all outstanding changes * * @author John Rice */ @@ -226,7 +225,7 @@ public class CommitAction extends ContextAction { panel.putClientProperty("DialogDescriptor", dd); // NOI18N final Dialog dialog = DialogDisplayer.getDefault().createDialog(dd); - dialog.addWindowListener(new DialogBoundsPreserver(GitModuleConfig.getDefault().getPreferences(), "hg.commit.dialog")); // NOI18N + dialog.addWindowListener(new DialogBoundsPreserver(GitModuleConfig.getDefault().getPreferences(), "git.commit.dialog")); // NOI18N dialog.pack(); dialog.setVisible(true); @@ -274,7 +273,7 @@ public class CommitAction extends ContextAction { CommitOptions options = files.get(fileNode); if (options == CommitOptions.EXCLUDE) continue; - //stickyTags.add(HgUtils.getCopy(fileNode.getFile())); + //stickyTags.add(GitUtils.getCopy(fileNode.getFile())); int status = fileNode.getInformation().getStatus(); if ((status & FileInformation.STATUS_REMOTE_CHANGE) != 0 || status == FileInformation.STATUS_VERSIONED_CONFLICT) { enabled = false; @@ -284,7 +283,7 @@ public class CommitAction extends ContextAction { panel.setErrorLabel("<html><font color=\"#002080\">" + msg + "</font></html>"); // NOI18N conflicts = true; } - //stickyTags.add(HgUtils.getCopy(fileNode.getFile())); + //stickyTags.add(GitUtils.getCopy(fileNode.getFile())); } @@ -374,13 +373,13 @@ public class CommitAction extends ContextAction { if (addCandidates.size() > 0 ) { GitCommand.doAdd(repository, addCandidates, logger); for (File f : addCandidates) { - logger.output("hg add " + f.getName()); //NOI18N + logger.output("git add " + f.getName()); //NOI18N } } if (deleteCandidates.size() > 0 ) { GitCommand.doRemove(repository, deleteCandidates, logger); for (File f : deleteCandidates) { - logger.output("hg delete " + f.getName()); //NOI18N + logger.output("git delete " + f.getName()); //NOI18N } } GitCommand.doCommit(repository, commitCandidates, message, logger); src/org/netbeans/modules/git/ui/commit/CommitAction.java @@ -221,9 +221,10 @@ public class CommitTable implements AncestorListener, TableModelListener { public void setNodes(GitFileNode[] nodes) { tableModel.setNodes(nodes); } - + /** - * @return Map&lt;HgFileNode, CommitOptions> + * + * @return Map&lt;GitFileNode, CommitOptions&gt; */ public Map<GitFileNode, CommitOptions> getCommitFiles() { return tableModel.getCommitFiles(); src/org/netbeans/modules/git/ui/commit/CommitTable.java @@ -124,7 +124,7 @@ public class CommitTableModel extends AbstractTableModel { } /** - * @return Map&lt;HgFileNode, CommitOptions> + * @return Map&lt;GitFileNode, CommitOptions> */ public Map<GitFileNode, CommitOptions> getCommitFiles() { Map<GitFileNode, CommitOptions> ret = new HashMap<GitFileNode, CommitOptions>(nodes.length); @@ -169,7 +169,7 @@ public class CommitTableModel extends AbstractTableModel { return nodes[rowIndex].getName(); // TODO deal with branch? //} else if (col.equals(COLUMN_NAME_BRANCH)) { - // String branch = HgUtils.getCopy(nodes[rowIndex].getFile()); + // String branch = GitUtils.getCopy(nodes[rowIndex].getFile()); // return branch == null ? "" : branch; // NOI18N } else if (col.equals(COLUMN_NAME_STATUS)) { node = nodes[rowIndex]; @@ -209,7 +209,7 @@ public class CommitTableModel extends AbstractTableModel { } private void defaultCommitOptions() { - boolean excludeNew = System.getProperty("netbeans.mercurial.excludeNewFiles") != null; // NOI18N + boolean excludeNew = System.getProperty("netbeans.git.excludeNewFiles") != null; // NOI18N commitOptions = new CommitOptions[nodes.length]; for (int i = 0; i < nodes.length; i++) { GitFileNode node = nodes[i]; src/org/netbeans/modules/git/ui/commit/CommitTableModel.java @@ -127,18 +127,18 @@ public class CreateAction extends ContextAction { } public void performAction(ActionEvent e) { - final Git hg = Git.getInstance(); + final Git git = Git.getInstance(); File [] files = context.getRootFiles().toArray(new File[context.getRootFiles().size()]); if(files == null || files.length == 0) return; - // If there is a .hg directory in an ancestor of any of the files in + // If there is a .git directory in an ancestor of any of the files in // the context we fail. for (File file : files) { if(!file.isDirectory()) file = file.getParentFile(); - if (hg.getTopmostManagedParent(file) != null) { - Git.LOG.log(Level.SEVERE, "Found .hg directory in ancestor of {0} ", // NOI18N + if (git.getTopmostManagedParent(file) != null) { + Git.LOG.log(Level.SEVERE, "Found .git directory in ancestor of {0} ", // NOI18N file); return; } @@ -171,7 +171,7 @@ public class CreateAction extends ContextAction { final File rootToManage = root; final String prjName = projName; - RequestProcessor rp = hg.getRequestProcessor(rootToManage.getAbsolutePath()); + RequestProcessor rp = git.getRequestProcessor(rootToManage.getAbsolutePath()); GitProgressSupport supportCreate = new GitProgressSupport() { public void perform() { @@ -189,8 +189,8 @@ public class CreateAction extends ContextAction { NbBundle.getMessage(CreateAction.class, "MSG_CREATE_INIT", prjName, rootToManage)); // NOI18N GitCommand.doCreate(rootToManage, logger); - hg.versionedFilesChanged(); - hg.refreshAllAnnotations(); + git.versionedFilesChanged(); + git.refreshAllAnnotations(); } catch (GitException ex) { NotifyDescriptor.Exception e = new NotifyDescriptor.Exception(ex); DialogDisplayer.getDefault().notifyLater(e); @@ -206,7 +206,7 @@ public class CreateAction extends ContextAction { OutputLogger logger = getLogger(); try { File[] files = GitUtils.getProjectRootFiles(proj); - FileStatusCache cache = hg.getFileStatusCache(); + FileStatusCache cache = git.getFileStatusCache(); FileInformation fi = new FileInformation(FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY, null, false); for (int j = 0; j < files.length; j++) { src/org/netbeans/modules/git/ui/create/CreateAction.java @@ -61,8 +61,8 @@ import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; /** - * ExportDiff action for mercurial: - * hg export + * ExportDiff action for Git: + * hg export = git diff (?) TODO: verify this is git diff * * @author Padraig O'Briain */ src/org/netbeans/modules/git/ui/diff/ExportDiffAction.java @@ -70,9 +70,9 @@ public class ExportDiffPanel extends javax.swing.JPanel implements ActionListene private File repository; private RequestProcessor.Task refreshViewTask; private Thread refreshViewThread; - private static final RequestProcessor rp = new RequestProcessor("MercurialExportDiff", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitExportDiff", 1); // NOI18N private RepositoryRevision repoRev; - private static final int HG_REVISION_TARGET_LIMIT = 100; + private static final int GIT_REVISION_TARGET_LIMIT = 100; /** Creates new form ExportDiffPanel */ public ExportDiffPanel(File repo, RepositoryRevision repoRev) { @@ -215,7 +215,7 @@ public class ExportDiffPanel extends javax.swing.JPanel implements ActionListene } private void refreshRevisions() { - java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, HG_REVISION_TARGET_LIMIT); + java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, GIT_REVISION_TARGET_LIMIT); Set<String> targetRevsSet = new LinkedHashSet<String>(); src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.java @@ -63,8 +63,8 @@ import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; /** - * ImportDiff action for mercurial: - * hg export + * ImportDiff action for Git: + * git apply (?) TODO: verify this is git apply * * @author Padraig O'Briain */ src/org/netbeans/modules/git/ui/diff/ImportDiffAction.java @@ -220,18 +220,18 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS updateButton.setToolTipText(NbBundle.getMessage(MultiDiffPanel.class, "MSG_UpdateDiff_Tooltip", contextName)); ButtonGroup grp = new ButtonGroup(); - nextAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-next.png"))) { // NOI18N + nextAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-next.png"))) { // NOI18N { - putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/diff/Bundle"). + putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/diff/Bundle"). getString("CTL_DiffPanel_Next_Tooltip")); } public void actionPerformed(ActionEvent e) { onNextButton(); } }; - prevAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-prev.png"))) { // NOI18N + prevAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-prev.png"))) { // NOI18N { - putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/diff/Bundle"). + putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/diff/Bundle"). getString("CTL_DiffPanel_Prev_Tooltip")); } public void actionPerformed(ActionEvent e) { src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java @@ -62,7 +62,7 @@ import org.openide.util.RequestProcessor; /** - * Adds/removes files to repository .hgignore. + * Adds/removes files to repository .gitignore. * * @author Maros Sandor */ @@ -92,7 +92,7 @@ public class IgnoreAction extends ContextAction { if (files.length == 0) return UNDEFINED; FileStatusCache cache = Git.getInstance().getFileStatusCache(); for (int i = 0; i < files.length; i++) { - if (files[i].getName().equals(".hg") || // NOI18N + if (files[i].getName().equals(".git") || // NOI18N files[i].isDirectory() || SharabilityQuery.getSharability(files[i])== SharabilityQuery.NOT_SHARABLE) { actionStatus = UNDEFINED; src/org/netbeans/modules/git/ui/ignore/IgnoreAction.java @@ -50,8 +50,8 @@ import org.netbeans.modules.versioning.spi.VCSContext; import org.openide.util.NbBundle; /** - * Log action for mercurial: - * hg log - show revision history of entire repository or files + * Log action for Git: + * git log - show revision history of entire repository or files * * @author John Rice */ src/org/netbeans/modules/git/ui/log/IncomingAction.java @@ -51,8 +51,8 @@ import org.openide.util.NbBundle; /** - * Log action for mercurial: - * hg log - show revision history of entire repository or files + * Log action for Git: + * git log - show revision history of entire repository or files * * @author John Rice */ src/org/netbeans/modules/git/ui/log/LogAction.java @@ -50,8 +50,8 @@ import org.openide.util.NbBundle; /** - * Log action for mercurial: - * hg log - show revision history of entire repository or files + * Log action for Git: + * git log - show revision history of entire repository or files * * @author John Rice */ src/org/netbeans/modules/git/ui/log/OutAction.java @@ -183,7 +183,6 @@ class SearchExecutor implements Runnable { for (RepositoryRevision.Event event : rev.getEvents()) { if (event.getChangedPath().getAction() == 'A' && event.getChangedPath().getCopySrcPath() != null) { // TBD: Need to handle Copy status - // http://www.selenic.com/mercurial/bts/Issue931 - should get it in HgCommand.getLogMessages() String existingMapping = historyPaths.get(event.getChangedPath().getPath()); if (existingMapping == null) { existingMapping = event.getChangedPath().getPath(); src/org/netbeans/modules/git/ui/log/SearchExecutor.java @@ -129,8 +129,8 @@ public class SearchHistoryAction extends ContextAction { } /** - * Opens the Seach History panel to view Mercurial Incoming Changesets that will be sent on next Pull from remote repo - * using: hg incoming - to get the data + * Opens the Search History panel to view Git Changesets that will be sent on next Pull from remote repo + * using: git incoming - to get the data * * @param title title of the search * @param commitMessage commit message to search for @@ -151,8 +151,8 @@ public class SearchHistoryAction extends ContextAction { }); } /** - * Opens the Seach History panel to view Mercurial Out Changesets that will be sent on next Push to remote repo - * using: hg out - to get the data + * Opens the Search History panel to view Git Out Changesets that will be sent on next Push to remote repo + * using: git out - to get the data * * @param title title of the search * @param commitMessage commit message to search for @@ -174,7 +174,7 @@ public class SearchHistoryAction extends ContextAction { } /** - * Opens the Seach History panel with given pre-filled values. The search is executed in default context + * Opens the Search History panel with given pre-filled values. The search is executed in default context * (all open projects). * * @param title title of the search src/org/netbeans/modules/git/ui/log/SearchHistoryAction.java @@ -197,18 +197,18 @@ class SearchHistoryPanel extends javax.swing.JPanel implements ExplorerManager.P tbDiff.setPreferredSize(d1); } - nextAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-next.png"))) { // NOI18N + nextAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-next.png"))) { // NOI18N { - putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/diff/Bundle"). // NOI18N + putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/diff/Bundle"). // NOI18N getString("CTL_DiffPanel_Next_Tooltip")); // NOI18N } public void actionPerformed(ActionEvent e) { diffView.onNextButton(); } }; - prevAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-prev.png"))) { // NOI18N + prevAction = new AbstractAction(null, new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-prev.png"))) { // NOI18N { - putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/diff/Bundle"). // NOI18N + putValue(Action.SHORT_DESCRIPTION, java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/diff/Bundle"). // NOI18N getString("CTL_DiffPanel_Prev_Tooltip")); // NOI18N } public void actionPerformed(ActionEvent e) { src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java @@ -127,24 +127,28 @@ public class SearchHistoryTopComponent extends TopComponent implements DiffSetup add(shp); } + @Override public int getPersistenceType(){ return TopComponent.PERSISTENCE_NEVER; } + @Override protected void componentClosed() { //((DiffMainPanel) getComponent(0)).componentClosed(); super.componentClosed(); } + @Override protected String preferredID(){ if (shp.isIncomingSearch()) { - return "Hg.IncomingSearchHistoryTopComponent"; // NOI18N + return "Git.IncomingSearchHistoryTopComponent"; // NOI18N } else if (shp.isOutSearch()) { - return "Hg.OutSearchHistoryTopComponent"; // NOI18N + return "Git.OutSearchHistoryTopComponent"; // NOI18N } - return "Hg.SearchHistoryTopComponent"; // NOI18N + return "Git.SearchHistoryTopComponent"; // NOI18N } + @Override public HelpCtx getHelpCtx() { return new HelpCtx(getClass()); } src/org/netbeans/modules/git/ui/log/SearchHistoryTopComponent.java @@ -48,7 +48,7 @@ MSG_MERGE_NOT_SUPPORTED_INVIEW = Merge is not supported in this View MSG_NOTHING_TO_MERGE = Nothing to Merge for this project. MSG_MERGE_INFO = \nINFO MERGE: How to setup Merge Support -MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram +MSG_MERGE_INFO_URL = http://www.kernel.org/pub/software/scm/git/docs/git-merge.html MSG_MERGE_UNCOMMITTED = There are uncommitted changes.\n\nPlease commit them before doing another merge. MSG_MERGE_UNAVAILABLE = Merge is not setup on your system.\n\nRefer to the Merge Support link in the Output window. MSG_MERGE_CONFLICT = INFO MERGE: CONFLICT - {0} src/org/netbeans/modules/git/ui/merge/Bundle.properties @@ -63,8 +63,8 @@ import org.openide.util.RequestProcessor; import org.openide.util.Utilities; /** - * Merge action for mercurial: - * hg merge - attempts to merge changes when the repository has 2 heads + * Merge action for Git: + * git merge - attempts to merge changes when the repository has 2 heads * * @author John Rice */ src/org/netbeans/modules/git/ui/merge/MergeAction.java @@ -60,9 +60,9 @@ public class MergeRevisionsPanel extends javax.swing.JPanel { private File repository; private RequestProcessor.Task refreshViewTask; private Thread refreshViewThread; - private static final RequestProcessor rp = new RequestProcessor("MercurialMerge", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitMerge", 1); // NOI18N - private static final int HG_HEAD_TARGET_LIMIT = 100; + private static final int GIT_HEAD_TARGET_LIMIT = 100; /** Creates new form ReverModificationsPanel */ public MergeRevisionsPanel(File repo) { @@ -157,7 +157,7 @@ public class MergeRevisionsPanel extends javax.swing.JPanel { } else { size = targetRevsList.size(); int i = 0; - while (i < size && i < HG_HEAD_TARGET_LIMIT) { + while (i < size && i < GIT_HEAD_TARGET_LIMIT) { targetRevsSet.add(targetRevsList.get(i)); i++; } src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java @@ -60,9 +60,9 @@ import org.openide.util.RequestProcessor; */ public class GitProperties implements ListSelectionListener { - public static final String HGPROPNAME_USERNAME = "username"; // NOI18N - public static final String HGPROPNAME_DEFAULT_PULL = "default-pull"; // NOI18N - public static final String HGPROPNAME_DEFAULT_PUSH = "default-push"; // NOI18N + public static final String GITPROPNAME_USERNAME = "username"; // NOI18N + public static final String GITPROPNAME_DEFAULT_PULL = "default-pull"; // NOI18N + public static final String GITPROPNAME_DEFAULT_PUSH = "default-push"; // NOI18N private PropertiesPanel panel; private File root; @@ -71,7 +71,7 @@ public class GitProperties implements ListSelectionListener { private File loadedValueFile; private Font fontTextArea; - /** Creates a new instance of HgProperties */ + /** Creates a new instance of GitProperties */ public GitProperties(PropertiesPanel panel, PropertiesTable propTable, File root) { this.panel = panel; this.propTable = propTable; @@ -108,17 +108,17 @@ public class GitProperties implements ListSelectionListener { support = new GitProgressSupport() { protected void perform() { Properties props = GitModuleConfig.getDefault().getProperties(root); - GitPropertiesNode[] hgProps = new GitPropertiesNode[props.size()]; + GitPropertiesNode[] gitProps = new GitPropertiesNode[props.size()]; int i = 0; for (Enumeration e = props.propertyNames(); e.hasMoreElements() ; ) { String name = (String) e.nextElement(); String tmp = props.getProperty(name); String value = tmp != null ? tmp : ""; // NOI18N - hgProps[i] = new GitPropertiesNode(name, value); + gitProps[i] = new GitPropertiesNode(name, value); i++; } - propTable.setNodes(hgProps); + propTable.setNodes(gitProps); } }; support.start(rp, root.getAbsolutePath(), org.openide.util.NbBundle.getMessage(GitProperties.class, "LBL_Properties_Progress")); // NOI18N @@ -133,13 +133,13 @@ public class GitProperties implements ListSelectionListener { support = new GitProgressSupport() { protected void perform() { GitModuleConfig.getDefault().clearProperties(root, "paths"); // NOI18N - GitModuleConfig.getDefault().removeProperty(root, "ui", HGPROPNAME_USERNAME); // NOI18N - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); - for (int i = 0; i < hgPropertiesNodes.length; i++) { - String hgPropertyName = hgPropertiesNodes[i].getName(); - String hgPropertyValue = hgPropertiesNodes[i].getValue(); - if (hgPropertyValue.trim().length() > 0 ) { - GitModuleConfig.getDefault().setProperty(root, hgPropertyName, hgPropertyValue); + GitModuleConfig.getDefault().removeProperty(root, "ui", GITPROPNAME_USERNAME); // NOI18N + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); + for (int i = 0; i < gitPropertiesNodes.length; i++) { + String gitPropertyName = gitPropertiesNodes[i].getName(); + String gitPropertyValue = gitPropertiesNodes[i].getValue(); + if (gitPropertyValue.trim().length() > 0 ) { + GitModuleConfig.getDefault().setProperty(root, gitPropertyName, gitPropertyValue); } } GitRepositoryContextCache.resetPullDefault(); @@ -156,9 +156,9 @@ public class GitProperties implements ListSelectionListener { public void updateLastSelection () { - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); if (lastIndex >= 0) { - hgPropertiesNodes[lastIndex].setValue(getPropertyValue()); + gitPropertiesNodes[lastIndex].setValue(getPropertyValue()); } } @@ -168,11 +168,11 @@ public class GitProperties implements ListSelectionListener { lastIndex = -1; return; } - GitPropertiesNode[] hgPropertiesNodes = propTable.getNodes(); + GitPropertiesNode[] gitPropertiesNodes = propTable.getNodes(); if (lastIndex >= 0) { - hgPropertiesNodes[lastIndex].setValue(getPropertyValue()); + gitPropertiesNodes[lastIndex].setValue(getPropertyValue()); } - panel.txtAreaValue.setText(hgPropertiesNodes[index].getValue()); + panel.txtAreaValue.setText(gitPropertiesNodes[index].getValue()); lastIndex = index; } src/org/netbeans/modules/git/ui/properties/GitProperties.java @@ -90,7 +90,7 @@ public class PropertiesAction extends ContextAction { panel.propsPanel.add(component, BorderLayout.CENTER); - GitProperties hgProperties = new GitProperties(panel, propTable, root); + GitProperties gitProperties = new GitProperties(panel, propTable, root); DialogDescriptor dd = new DialogDescriptor(panel, org.openide.util.NbBundle.getMessage(PropertiesAction.class, "CTL_PropertiesDialog_Title", null), true, null); // NOI18N JButton okButton = new JButton(); @@ -110,8 +110,8 @@ public class PropertiesAction extends ContextAction { dialog.pack(); dialog.setVisible(true); if (dd.getValue() == okButton) { - hgProperties.updateLastSelection(); - hgProperties.setProperties(); + gitProperties.updateLastSelection(); + gitProperties.setProperties(); } } src/org/netbeans/modules/git/ui/properties/PropertiesAction.java @@ -83,7 +83,7 @@ MSG_FETCH_PROGRESS = Fetching... MSG_FETCH_SETFETCH_PROP_CONFIRM_TITLE = Add Fetch Extension MSG_FETCH_SETFETCH_PROP_CONFIRM_QUERY= To work fetch requires the Fetch extension to be added to your .gitconfig config file.\n\nDo you want this extension added now? -MSG_FETCH_SETHGK_PROP_DO_INFO = INFO: Setting fetch in your .gitconfig config file -MSG_FETCH_NOTSETHGK_PROP_INFO = INFO: fetch not set in your .gitconfig config file, so Fetch can not be run +MSG_FETCH_SETGITK_PROP_DO_INFO = INFO: Setting fetch in your .gitconfig config file +MSG_FETCH_NOTSETGITK_PROP_INFO = INFO: fetch not set in your .gitconfig config file, so Fetch can not be run MSG_FETCH_DONE = INFO: End of Git Fetch \ No newline at end of file src/org/netbeans/modules/git/ui/pull/Bundle.properties @@ -61,7 +61,7 @@ import org.openide.util.RequestProcessor; /** * Fetch action for Git: - * git fetch - launch hg view to view the dependency tree for the repository + * git fetch - launch git show (?? -- TODO verify this) to view the dependency tree for the repository * Pull changes from a remote repository, merge new changes if needed. * This finds all changes from the repository at the specified path * or URL and adds them to the local repository. src/org/netbeans/modules/git/ui/pull/FetchAction.java @@ -103,7 +103,7 @@ public class PullOtherAction extends ContextAction implements PropertyChangeList new HelpCtx(PullOtherAction.class), new Object[] {pullButton, cancelButton}, true, - "hg.pull.dialog"); + "git.pull.dialog"); if (option == pullButton) { final String pullPath = repository.getSelectedRC().getUrl(); pull(context, root, pullPath); src/org/netbeans/modules/git/ui/pull/PullOtherAction.java @@ -103,7 +103,7 @@ public class PushOtherAction extends ContextAction implements PropertyChangeList new HelpCtx(PushOtherAction.class), new Object[] {pushButton, cancelButton}, true, - "hg.push.dialog"); + "git.push.dialog"); if (option == pushButton) { final String pushPath = repository.getSelectedRC().getUrl(); src/org/netbeans/modules/git/ui/push/PushOtherAction.java @@ -285,7 +285,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen } else if (e.getDocument() == (repositoryPanel.tunnelCommandTextField.getDocument())) { onTunnelCommandChange(); } - validateHgUrl(); + validateGitUrl(); } }; SwingUtilities.invokeLater(awt); @@ -294,14 +294,14 @@ public class Repository implements ActionListener, DocumentListener, FocusListen /** * Fast url syntax check. It can invalidate the whole step */ - private void validateHgUrl() { + private void validateGitUrl() { boolean valid = true; RepositoryConnection rc = null; try { rc = getSelectedRC(); // check for a valid svnurl - rc.getHgUrl(); + rc.getGitUrl(); //if(!isSet(FLAG_ACCEPT_REVISION) && !rc.getSvnRevision().equals(SVNRevision.HEAD)) //{ // message = NbBundle.getMessage(Repository.class, "MSG_Repository_OnlyHEADRevision"); // NOI18N @@ -388,7 +388,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen } } - /** Shows proper fields depending on Mercurial connection method. */ + /** Shows proper fields depending on Git connection method. */ private void updateVisibility(String selectedUrlString) { boolean authFields = false; @@ -468,11 +468,11 @@ public class Repository implements ActionListener, DocumentListener, FocusListen } return ""; // NOI18N } else { - final String[] hgUrl = new String[1]; + final String[] gitUrl = new String[1]; try { Runnable awt = new Runnable() { public void run() { - hgUrl[0] = (String) repositoryPanel.urlComboBox.getEditor().getItem().toString().trim(); + gitUrl[0] = (String) repositoryPanel.urlComboBox.getEditor().getItem().toString().trim(); } }; if (SwingUtilities.isEventDispatchThread()) { @@ -480,7 +480,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen } else { SwingUtilities.invokeAndWait(awt); } - return hgUrl[0].trim(); + return gitUrl[0].trim(); } catch (InvocationTargetException e) { ErrorManager err = ErrorManager.getDefault(); err.notify(e); @@ -550,7 +550,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen if (rc != null) { rc.setSavePassword(repositoryPanel.savePasswordCheckBox.isSelected()); } - validateHgUrl(); + validateGitUrl(); } }; SwingUtilities.invokeLater(awt); @@ -715,6 +715,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen super.addElement(obj); } + @Override public void insertElementAt(Object obj,int index) { if(obj instanceof String) { String str = (String) obj; @@ -732,6 +733,7 @@ public class Repository implements ActionListener, DocumentListener, FocusListen super.insertElementAt(obj, index); } + @Override public void removeElement(Object obj) { int index = getIndexOf(obj); if ( index != -1 ) { src/org/netbeans/modules/git/ui/repository/Repository.java @@ -58,7 +58,7 @@ public class RepositoryConnection { private String externalCommand; private boolean savePassword; - private GitURL hgUrl; + private GitURL gitUrl; public RepositoryConnection(RepositoryConnection rc) { this(rc.url, rc.username, rc.password, rc.externalCommand, rc.savePassword); @@ -96,13 +96,14 @@ public class RepositoryConnection { return savePassword; } - public GitURL getHgUrl() throws MalformedURLException { - if(hgUrl == null) { + public GitURL getGitUrl() throws MalformedURLException { + if(gitUrl == null) { parseUrlString(url); } - return hgUrl; + return gitUrl; } + @Override public boolean equals(Object o) { if (o == null) { return false; @@ -119,6 +120,7 @@ public class RepositoryConnection { return true; } + @Override public int hashCode() { int hash = 3; hash = 61 * hash + (this.url != null ? this.url.hashCode() : 0); @@ -127,7 +129,7 @@ public class RepositoryConnection { void setUrl(String url) { this.url = url; - hgUrl = null; + gitUrl = null; } void setUsername(String username) { @@ -171,7 +173,7 @@ public class RepositoryConnection { // urlString = urlString.substring(0, idx); // } //urlO = removeEmptyPathSegments(new URL(urlString)); - hgUrl = new GitURL(urlString); + gitUrl = new GitURL(urlString); } //private URL removeEmptyPathSegments(URL url) throws MalformedURLException { @@ -179,7 +181,7 @@ public class RepositoryConnection { // StringBuffer urlString = new StringBuffer(); // urlString.append(url.getProtocol()); // urlString.append("://"); // NOI18N - // urlString.append(HgUtils.ripUserFromHost(url.getHost())); + // urlString.append(GitUtils.ripUserFromHost(url.getHost())); // if(url.getPort() > 0) { // urlString.append(":"); // NOI18N // urlString.append(url.getPort()); src/org/netbeans/modules/git/ui/repository/RepositoryConnection.java @@ -64,16 +64,16 @@ import org.openide.util.RequestProcessor; /** - * Pull action for mercurial: - * hg pull - pull changes from the specified source + * Pull action for Git: + * git pull - pull changes from the specified source * * @author John Rice */ public class BackoutAction extends ContextAction { private final VCSContext context; - private static final String HG_BACKOUT_REVISION_REPLACE = "\\{revision}"; - public static final String HG_BACKOUT_REVISION = " {revision}"; + private static final String GIT_BACKOUT_REVISION_REPLACE = "\\{revision}"; + public static final String GIT_BACKOUT_REVISION = " {revision}"; public BackoutAction(String name, VCSContext context) { this.context = context; @@ -100,7 +100,7 @@ public class BackoutAction extends ContextAction { commitMsg = backout.getCommitMessage(); final boolean doMerge = false; // Now handling this using our own merge mechanism, not backout's final String revStr = rev; - commitMsg = commitMsg.replaceAll(HG_BACKOUT_REVISION_REPLACE, revStr); //NOI18N + commitMsg = commitMsg.replaceAll(GIT_BACKOUT_REVISION_REPLACE, revStr); //NOI18N final String commitMsgStr = commitMsg; RequestProcessor rp = Git.getInstance().getRequestProcessor(repository); src/org/netbeans/modules/git/ui/rollback/BackoutAction.java @@ -63,10 +63,10 @@ public class BackoutPanel extends javax.swing.JPanel { private File repository; private RequestProcessor.Task refreshViewTask; - private static final RequestProcessor rp = new RequestProcessor("MercurialBackout", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitBackout", 1); // NOI18N private Thread refreshViewThread; - private static final int HG_REVERT_TARGET_LIMIT = 100; + private static final int GIT_REVERT_TARGET_LIMIT = 100; /** Creates new form ReverModificationsPanel */ public BackoutPanel(File repo) { @@ -75,7 +75,7 @@ public class BackoutPanel extends javax.swing.JPanel { initComponents(); commitMsgField.setText( NbBundle.getMessage(BackoutPanel.class, "BackoutPanel.commitMsgField.text") + - BackoutAction.HG_BACKOUT_REVISION); // NOI18N + BackoutAction.GIT_BACKOUT_REVISION); // NOI18N refreshViewTask.schedule(0); } @@ -240,7 +240,7 @@ public class BackoutPanel extends javax.swing.JPanel { } private void refreshRevisions() { - java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, HG_REVERT_TARGET_LIMIT); + java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, GIT_REVERT_TARGET_LIMIT); Set<String> targetRevsSet = new LinkedHashSet<String>(); src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java @@ -62,7 +62,7 @@ MSG_STRIP_TITLE = Git Strip MSG_STRIP_TITLE_SEP = --------- MSG_STRIP_INFO_SEP = Stripping revision {0} and descendents in:\n{1} MSG_NO_REV_STRIP = \nINFO: Unable to Strip this Revision {0} -MSG_LOCAL_CHANGES_STRIP = \nStrip will not work if there are local changes. You can view them using Git -> Status.\nINFO: If you wish to discard local changes, use Mercurial -> Update selecting the Forced Update option and rerun Strip. +MSG_LOCAL_CHANGES_STRIP = \nStrip will not work if there are local changes. You can view them using Git -> Status.\nINFO: If you wish to discard local changes, use Git -> Update selecting the Forced Update option and rerun Strip. MSG_MULTI_HEADS_STRIP = \nINFO: Strip will not work across multiple heads unless the Force multihead option is selected. MSG_STRIP_RESTORE_INFO = \nINFO: Strip can be undone using the saved backup bundle. On the command line run: MSG_STRIP_RESTORE_INFO2 = git unbundle {0} @@ -75,8 +75,8 @@ MSG_BACKOUT_INFO_SEP = Backout revision {0} in:\n{1} MSG_NO_REV_BACKOUT = \nINFO: Unable to Backout this Revision {0} MSG_BACKOUT_PROGRESS = Backout... MSG_BACKOUT_DONE = INFO: End of Git Backout -MSG_UNCOMMITTED_CHANGES_BACKOUT = \nBackout will not work if there are uncommitted local changes. You can view them using Mercurial -> Status.\nINFO: If you wish to discard these changes, use Mercurial -> Update selecting the Forced Update option and rerun Backout. -MSG_MERGE_CSET_BACKOUT = \nCannot backout a backout merge changeset.\nINFO: Either run git backout --parent from the command line or use Mercurial -> Rollback. +MSG_UNCOMMITTED_CHANGES_BACKOUT = \nBackout will not work if there are uncommitted local changes. You can view them using Git -> Status.\nINFO: If you wish to discard these changes, use Git -> Update selecting the Forced Update option and rerun Backout. +MSG_MERGE_CSET_BACKOUT = \nCannot backout a backout merge changeset.\nINFO: Either run git backout --parent from the command line or use Git -> Rollback. MSG_BACKOUT_MERGE_CONFIRM_TITLE = Confirm Merge after Backout MSG_BACKOUT_MERGE_CONFIRM_QUERY = Backout has completed and Merge is Required.\nMerge the backout changeset now? MSG_BACKOUT_MERGE_DO = INFO MERGE: Performing Merge with backout changeset src/org/netbeans/modules/git/ui/rollback/Bundle.properties @@ -71,7 +71,7 @@ import org.openide.util.RequestProcessor; public class StripAction extends ContextAction { private final VCSContext context; - private static String HG_STIP_SAVE_BUNDLE = "saving bundle to "; + private static String GIT_STRIP_SAVE_BUNDLE = "saving bundle to "; public StripAction(String name, VCSContext context) { this.context = context; @@ -139,7 +139,7 @@ public class StripAction extends ContextAction { Git.getInstance().changesetChanged(root); } String savingTo = list.get(list.size()-1); - savingTo = savingTo != null? savingTo.substring(HG_STIP_SAVE_BUNDLE.length()): null; + savingTo = savingTo != null? savingTo.substring(GIT_STRIP_SAVE_BUNDLE.length()): null; File savingFile = new File(savingTo); if(savingFile != null && savingFile.exists() && savingFile.canRead()){ logger.outputInRed( src/org/netbeans/modules/git/ui/rollback/StripAction.java @@ -63,10 +63,10 @@ public class StripPanel extends javax.swing.JPanel { private File repository; private RequestProcessor.Task refreshViewTask; - private static final RequestProcessor rp = new RequestProcessor("MercurialStrip", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitStrip", 1); // NOI18N private Thread refreshViewThread; - private static final int HG_STRIP_TARGET_LIMIT = 100; + private static final int GIT_STRIP_TARGET_LIMIT = 100; /** Creates new form ReverModificationsPanel */ public StripPanel(File repo) { @@ -237,7 +237,7 @@ public class StripPanel extends javax.swing.JPanel { } private void refreshRevisions() { - java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, HG_STRIP_TARGET_LIMIT); + java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, GIT_STRIP_TARGET_LIMIT); Set<String> targetRevsSet = new LinkedHashSet<String>(); src/org/netbeans/modules/git/ui/rollback/StripPanel.java @@ -77,7 +77,7 @@ public class GitVersioningTopComponent extends TopComponent { putClientProperty("SlidingName", NbBundle.getMessage(GitVersioningTopComponent.class, "CTL_Versioning_TopComponent_Title")); //NOI18N setName(NbBundle.getMessage(GitVersioningTopComponent.class, "CTL_Versioning_TopComponent_Title")); // NOI18N - setIcon(org.openide.util.Utilities.loadImage("org/netbeans/modules/mercurial/resources/icons/versioning-view.png")); // NOI18N + setIcon(org.openide.util.Utilities.loadImage("org/netbeans/modules/git/resources/icons/versioning-view.png")); // NOI18N setLayout(new BorderLayout()); getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(GitVersioningTopComponent.class, "CTL_Versioning_TopComponent_Title")); // NOI18N syncPanel = new VersioningPanel(this); @@ -183,7 +183,7 @@ public class GitVersioningTopComponent extends TopComponent { } /** - * Obtain the HgVersioningTopComponent instance. Never call {@link #getDefault} directly! + * Obtain the GitVersioningTopComponent instance. Never call {@link #getDefault} directly! */ public static synchronized GitVersioningTopComponent findInstance() { TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID); src/org/netbeans/modules/git/ui/status/GitVersioningTopComponent.java @@ -1,6 +1,5 @@ package org.netbeans.modules.git.ui.status; - import java.awt.event.ActionEvent; import java.io.File; import java.util.Calendar; src/org/netbeans/modules/git/ui/status/StatusAction.java @@ -65,7 +65,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer private ExplorerManager explorerManager; private final GitVersioningTopComponent parentTopComponent; - private final Git mercurial; + private final Git git; private VCSContext context; private int displayStatuses; private String branchInfo; @@ -73,12 +73,12 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer private RequestProcessor.Task refreshViewTask; private Thread refreshViewThread; - private GitProgressSupport hgProgressSupport; - private static final RequestProcessor rp = new RequestProcessor("MercurialView", 1, true); // NOI18N + private GitProgressSupport gitProgressSupport; + private static final RequestProcessor rp = new RequestProcessor("GitView", 1, true); // NOI18N private final NoContentPanel noContentComponent = new NoContentPanel(); - private static final int HG_UPDATE_TARGET_LIMIT = 100; + private static final int GIT_UPDATE_TARGET_LIMIT = 100; /** * Creates a new Synchronize Panel managed by the given versioning system. @@ -87,7 +87,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer */ public VersioningPanel(GitVersioningTopComponent parent) { this.parentTopComponent = parent; - this.mercurial = Git.getInstance(); + this.git = Git.getInstance(); refreshViewTask = rp.create(new RefreshViewTask()); explorerManager = new ExplorerManager(); displayStatuses = FileInformation.STATUS_LOCAL_CHANGE; @@ -158,8 +158,8 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer public void addNotify() { super.addNotify(); GitModuleConfig.getDefault().getPreferences().addPreferenceChangeListener(this); - mercurial.getFileStatusCache().addPropertyChangeListener(this); - mercurial.addPropertyChangeListener(this); + git.getFileStatusCache().addPropertyChangeListener(this); + git.addPropertyChangeListener(this); explorerManager.addPropertyChangeListener(this); reScheduleRefresh(0); // the view does not listen for changes when it is not visible } @@ -167,8 +167,8 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer @Override public void removeNotify() { GitModuleConfig.getDefault().getPreferences().removePreferenceChangeListener(this); - mercurial.getFileStatusCache().removePropertyChangeListener(this); - mercurial.removePropertyChangeListener(this); + git.getFileStatusCache().removePropertyChangeListener(this); + git.removePropertyChangeListener(this); explorerManager.removePropertyChangeListener(this); super.removeNotify(); } @@ -235,7 +235,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer if (files == null || files.length == 0) return; /* #126311: Optimize UI for Large repos - File root = mercurial.getTopmostManagedParent(files[0]); + File root = git.getTopmostManagedParent(files[0]); String[] info = getRepositoryBranchInfo(root); String branchName = info != null ? info[0] : null; String rev = info != null ? info[1] : null; @@ -312,7 +312,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer } private SyncFileNode [] getNodes(VCSContext context, int includeStatus) { - GitFileNode [] fnodes = mercurial.getNodes(context, includeStatus); + GitFileNode [] fnodes = git.getNodes(context, includeStatus); SyncFileNode [] nodes = new SyncFileNode[fnodes.length]; for (int i = 0; i < fnodes.length; i++) { if (Thread.interrupted()) return null; @@ -349,7 +349,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer /** * Refreshes statuses of all files in the view. It does - * that by issuing the "hg status -marduiC" command, updating the cache + * that by issuing the "git status -marduiC" command, updating the cache * and refreshing file nodes. */ private void onRefreshAction() { @@ -370,16 +370,16 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer /* Async Connects to repository and gets recent status. */ private void refreshStatuses() { - if(hgProgressSupport!=null) { - hgProgressSupport.cancel(); - hgProgressSupport = null; + if(gitProgressSupport!=null) { + gitProgressSupport.cancel(); + gitProgressSupport = null; } final String repository = GitUtils.getRootPath(context); if (repository == null) return; RequestProcessor rp = Git.getInstance().getRequestProcessor(repository); - hgProgressSupport = new GitProgressSupport() { + gitProgressSupport = new GitProgressSupport() { public void perform() { StatusAction.executeStatus(context, this); setupModels(); @@ -387,7 +387,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer }; parentTopComponent.contentRefreshed(); - hgProgressSupport.start(rp, repository, org.openide.util.NbBundle.getMessage(VersioningPanel.class, "LBL_Refresh_Progress")); // NOI18N + gitProgressSupport.start(rp, repository, org.openide.util.NbBundle.getMessage(VersioningPanel.class, "LBL_Refresh_Progress")); // NOI18N } src/org/netbeans/modules/git/ui/status/VersioningPanel.java @@ -131,7 +131,7 @@ public class RevertModificationsAction extends ContextAction { NbBundle.getMessage(RevertModificationsAction.class, "MSG_REVERT_TITLE_SEP")); // NOI18N - // revStr == null => no -r REV in hg revert command + // revStr == null => no -r REV in git revert command // No revisions to revert too if (revStr != null && NbBundle.getMessage(RevertModificationsAction.class, "MSG_Revision_Default").startsWith(revStr)) { src/org/netbeans/modules/git/ui/update/RevertModificationsAction.java @@ -65,9 +65,9 @@ public class RevertModificationsPanel extends javax.swing.JPanel { private File[] revertFiles; private RequestProcessor.Task refreshViewTask; private Thread refreshViewThread; - private static final RequestProcessor rp = new RequestProcessor("MercurialRevert", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitRevert", 1); // NOI18N - private static final int HG_REVERT_TARGET_LIMIT = 100; + private static final int GIT_REVERT_TARGET_LIMIT = 100; /** Creates new form ReverModificationsPanel */ public RevertModificationsPanel(File repo, File[] files) { @@ -213,7 +213,7 @@ public class RevertModificationsPanel extends javax.swing.JPanel { } private void refreshRevisions() { - java.util.List<String> targetRevsList = GitCommand.getRevisionsForFile(repository, revertFiles, HG_REVERT_TARGET_LIMIT); + java.util.List<String> targetRevsList = GitCommand.getRevisionsForFile(repository, revertFiles, GIT_REVERT_TARGET_LIMIT); Set<String> targetRevsSet = new LinkedHashSet<String>(); src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java @@ -61,8 +61,8 @@ import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; /** - * Update action for mercurial: - * hg update - update or merge working directory + * Update action for Git: + * git update - update or merge working directory * * @author John Rice */ src/org/netbeans/modules/git/ui/update/UpdateAction.java @@ -62,10 +62,10 @@ public class UpdatePanel extends javax.swing.JPanel { private File repository; private RequestProcessor.Task refreshViewTask; - private static final RequestProcessor rp = new RequestProcessor("MercurialUpdate", 1); // NOI18N + private static final RequestProcessor rp = new RequestProcessor("GitUpdate", 1); // NOI18N private Thread refreshViewThread; - private static final int HG_REVERT_TARGET_LIMIT = 100; + private static final int GIT_REVERT_TARGET_LIMIT = 100; /** Creates new form ReverModificationsPanel */ public UpdatePanel(File repo) { @@ -197,7 +197,7 @@ public class UpdatePanel extends javax.swing.JPanel { } private void refreshRevisions() { - java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, HG_REVERT_TARGET_LIMIT); + java.util.List<String> targetRevsList = GitCommand.getRevisions(repository, GIT_REVERT_TARGET_LIMIT); Set<String> targetRevsSet = new LinkedHashSet<String>(); src/org/netbeans/modules/git/ui/update/UpdatePanel.java @@ -42,11 +42,11 @@ MSG_VIEW_TITLE = Git View MSG_VIEW_TITLE_SEP = -------- MSG_VIEW_LAUNCH_INFO = INFO: Launching Gitk for {0} -MSG_VIEW_HGK_NOT_FOUND = View requires gitk to work and gitk is not on your PATH.\n\nPlease install gitk or if installed, modify your PATH. -MSG_VIEW_HGK_NOT_FOUND_TITLE = Gitk not found -MSG_VIEW_HGK_NOT_FOUND_INFO = INFO: gitk is not on your PATH, please install gitk or if installed, modify your PATH -MSG_VIEW_SETHGK_PROP_CONFIRM_TITLE = Add Gitk Extension -MSG_VIEW_SETHGK_PROP_CONFIRM_QUERY = To work View requires the gitk extension to be added to your .gitconfig config file.\n\nDo you want this extension added now? -MSG_VIEW_SETHGK_PROP_DO_INFO = INFO: Setting hgkext.hgk in your .gitconfig config file +MSG_VIEW_GITK_NOT_FOUND = View requires gitk to work and gitk is not on your PATH.\n\nPlease install gitk or if installed, modify your PATH. +MSG_VIEW_GITK_NOT_FOUND_TITLE = Gitk not found +MSG_VIEW_GITK_NOT_FOUND_INFO = INFO: gitk is not on your PATH, please install gitk or if installed, modify your PATH +MSG_VIEW_SETGITK_PROP_CONFIRM_TITLE = Add Gitk Extension +MSG_VIEW_SETGITK_PROP_CONFIRM_QUERY = To work View requires the gitk extension to be added to your .gitconfig config file.\n\nDo you want this extension added now? +MSG_VIEW_SETGITK_PROP_DO_INFO = INFO: Setting XXXXXXXX in your .gitconfig config file -MSG_VIEW_NOTSETHGK_PROP_INFO = INFO: hgkext.hgk not set in your .gitconfig config file, so View can not be launched \ No newline at end of file +MSG_VIEW_NOTSETGITK_PROP_INFO = INFO: XXXXX not set in your .gitconfig config file, so View can not be launched \ No newline at end of file src/org/netbeans/modules/git/ui/view/Bundle.properties @@ -66,7 +66,7 @@ import org.openide.util.RequestProcessor; public class ViewAction extends ContextAction { private final VCSContext context; - private static final String HG_SCRIPTS_DIR = "scripts"; + private static final String GIT_SCRIPTS_DIR = "scripts"; public ViewAction(String name, VCSContext context) { this.context = context; @@ -91,12 +91,12 @@ public class ViewAction extends ContextAction { logger.outputInRed(NbBundle.getMessage(ViewAction.class, "MSG_VIEW_TITLE")); // NOI18N logger.outputInRed(NbBundle.getMessage(ViewAction.class, "MSG_VIEW_TITLE_SEP")); // NOI18N - String hgkCommand = GitCommand.GITK_COMMAND; + String gitkCommand = GitCommand.GITK_COMMAND; // if(Utilities.isWindows()){ -// hgkCommand = hgkCommand + GitCommand.GIT_WINDOWS_CMD; +// gitkCommand = gitkCommand + GitCommand.GIT_WINDOWS_CMD; // } - boolean bHgkFound = false; -// if(GitUtils.isInUserPath(hgkCommand)){ + boolean bGitkFound = false; +// if(GitUtils.isInUserPath(gitkCommand)){ // bHgkFound = true; // } else if(GitUtils.isSolaris()){ // File f = new File(GitCommand.HG_HGK_PATH_SOLARIS10, hgkCommand); @@ -105,32 +105,32 @@ public class ViewAction extends ContextAction { // }else if(Utilities.isWindows()){ // bHgkFound = HgUtils.isInUserPath(HG_SCRIPTS_DIR + File.separator + hgkCommand); // } - boolean bHgkPropExists = GitConfigFiles.getInstance().containsProperty( - GitConfigFiles.HG_EXTENSIONS, GitConfigFiles.HG_EXTENSIONS_HGK); + boolean bGitkPropExists = GitConfigFiles.getInstance().containsProperty( + GitConfigFiles.GIT_EXTENSIONS, GitConfigFiles.GIT_EXTENSIONS_GITK); - if(!bHgkFound){ + if(!bGitkFound){ logger.outputInRed( - NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND_INFO")); // NOI18N + NbBundle.getMessage(ViewAction.class, "MSG_VIEW_GITK_NOT_FOUND_INFO")); // NOI18N logger.output(""); // NOI18N JOptionPane.showMessageDialog(null, - NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND"),// NOI18N - NbBundle.getMessage(ViewAction.class, "MSG_VIEW_HGK_NOT_FOUND_TITLE"),// NOI18N + NbBundle.getMessage(ViewAction.class, "MSG_VIEW_GITK_NOT_FOUND"),// NOI18N + NbBundle.getMessage(ViewAction.class, "MSG_VIEW_GITK_NOT_FOUND_TITLE"),// NOI18N JOptionPane.INFORMATION_MESSAGE); logger.closeLog(); return; } - if(!bHgkPropExists){ - boolean bConfirmSetHgkProp = false; - bConfirmSetHgkProp = GitUtils.confirmDialog( - ViewAction.class, "MSG_VIEW_SETHGK_PROP_CONFIRM_TITLE", // NOI18N - "MSG_VIEW_SETHGK_PROP_CONFIRM_QUERY"); // NOI18N - if (bConfirmSetHgkProp) { + if(!bGitkPropExists){ + boolean bConfirmSetGitkProp = false; + bConfirmSetGitkProp = GitUtils.confirmDialog( + ViewAction.class, "MSG_VIEW_SETGITK_PROP_CONFIRM_TITLE", // NOI18N + "MSG_VIEW_SETGITK_PROP_CONFIRM_QUERY"); // NOI18N + if (bConfirmSetGitkProp) { logger.outputInRed( - NbBundle.getMessage(ViewAction.class, "MSG_VIEW_SETHGK_PROP_DO_INFO")); // NOI18N - GitConfigFiles.getInstance().setProperty(GitConfigFiles.HG_EXTENSIONS_HGK, ""); // NOI18N + NbBundle.getMessage(ViewAction.class, "MSG_VIEW_SETGITK_PROP_DO_INFO")); // NOI18N + GitConfigFiles.getInstance().setProperty(GitConfigFiles.GIT_EXTENSIONS_GITK, ""); // NOI18N }else{ logger.outputInRed( - NbBundle.getMessage(ViewAction.class, "MSG_VIEW_NOTSETHGK_PROP_INFO")); // NOI18N + NbBundle.getMessage(ViewAction.class, "MSG_VIEW_NOTSETGITK_PROP_INFO")); // NOI18N logger.output(""); // NOI18N logger.closeLog(); return; src/org/netbeans/modules/git/ui/view/ViewAction.java @@ -263,7 +263,7 @@ public class CloneRepositoryWizardPanel implements WizardDescriptor.Asynchronous invalid(null); // This command validates the url - rc.getHgUrl(); + rc.getGitUrl(); String urlStr = rc.getUrl(); URI uri = new URI(urlStr); String uriSch = uri.getScheme(); @@ -278,7 +278,7 @@ public class CloneRepositoryWizardPanel implements WizardDescriptor.Asynchronous URL url = new URL(urlStr); HttpURLConnection con = (HttpURLConnection) url.openConnection(); // Note: valid repository returns con.getContentLength() = -1 - // so no way to reliably test if this url exists, without using hg + // so no way to reliably test if this url exists, without using git if (con != null){ String userInfo = uri.getUserInfo(); boolean bNoUserAndOrPasswordInURL = userInfo == null; src/org/netbeans/modules/git/ui/wizards/CloneRepositoryWizardPanel.java @@ -40,8 +40,8 @@ MSG_WARN_UPDATE_MERGE_TEXT = Merge is required - run menu command "Merge" MSG_WARN_UPDATE_COMMIT_TEXT = Merge has been done, invoke "Commit" menu item\n to commit these changes before doing an "Update" -MSG_WARN_NO_VIEW_TEXT = git: unknown command 'view'\n Have you added "hgext.hgk =" to extensions section of .gitconfig? -MSG_WARN_HGK_NOT_FOUND_TEXT = sh: gitk not found\n Is the location of gitk in your path? +MSG_WARN_NO_VIEW_TEXT = git: unknown command 'view'\n Have you added "XXXXXXXX" to extensions section of .gitconfig? +MSG_WARN_GITK_NOT_FOUND_TEXT = sh: gitk not found\n Is the location of gitk in your path? MSG_UNABLE_EXECUTE_COMMAND = Unable to execute command\n\nSee Output Window for further details MSG_COMMAND_ABORTED = Command failed\n\nSee Output Window for further details src/org/netbeans/modules/git/util/Bundle.properties @@ -78,6 +78,7 @@ import org.openide.util.Utilities; /** * + * * @author alexbcoles */ public class GitCommand { @@ -85,7 +86,7 @@ public class GitCommand { public static final String GIT_COMMAND = "git"; // NOI18N public static final String GITK_COMMAND = "gitk"; - private static final String GIT_STATUS_CMD = "status"; // NOI18N // need -A to see ignored files, specified in .hgignore, see man hgignore for details + private static final String GIT_STATUS_CMD = "status"; // NOI18N // need -A to see ignored files, specified in .gitignore, see man gitignore for details private static final String GIT_OPT_REPOSITORY = "--repository"; // NOI18N private static final String GIT_OPT_BUNDLE = "--bundle"; // NOI18N private static final String GIT_OPT_CWD_CMD = "--cwd"; // NOI18N @@ -106,8 +107,8 @@ public class GitCommand { private static final String GIT_COMMIT_CMD = "commit"; // NOI18N private static final String GIT_COMMIT_OPT_LOGFILE_CMD = "--logfile"; // NOI18N - private static final String GIT_COMMIT_TEMPNAME = "hgcommit"; // NOI18N - private static final String GIT_COMMIT_TEMPNAME_SUFFIX = ".hgm"; // NOI18N + private static final String GIT_COMMIT_TEMPNAME = "gitcommit"; // NOI18N + private static final String GIT_COMMIT_TEMPNAME_SUFFIX = ".gitm"; // NOI18N private static final String GIT_COMMIT_DEFAULT_MESSAGE = "[no commit message]"; // NOI18N private static final String GIT_REVERT_CMD = "revert"; // NOI18N @@ -134,13 +135,13 @@ public class GitCommand { private static final String GIT_OUT_CMD = "out"; // NOI18N private static final String GIT_LOG_LIMIT_ONE_CMD = "-l 1"; // NOI18N private static final String GIT_LOG_LIMIT_CMD = "-l"; // NOI18N - private static final String GIT_LOG_TEMPLATE_SHORT_CMD = "--template={rev}\\n{desc|firstline}\\n{date|hgdate}\\n{node|short}\\n"; // NOI18N - private static final String GIT_LOG_TEMPLATE_LONG_CMD = "--template={rev}\\n{desc}\\n{date|hgdate}\\n{node|short}\\n"; // NOI18N + private static final String GIT_LOG_TEMPLATE_SHORT_CMD = "--template={rev}\\n{desc|firstline}\\n{date|gitdate}\\n{node|short}\\n"; // NOI18N + private static final String GIT_LOG_TEMPLATE_LONG_CMD = "--template={rev}\\n{desc}\\n{date|gitdate}\\n{node|short}\\n"; // NOI18N private static final String GIT_LOG_NO_MERGES_CMD = "-M"; private static final String GIT_LOG_DEBUG_CMD = "--debug"; private static final String GIT_LOG_TEMPLATE_HISTORY_CMD = - "--template=rev:{rev}\\nauth:{author}\\ndesc:{desc}\\ndate:{date|hgdate}\\nid:{node|short}\\n" + // NOI18N + "--template=rev:{rev}\\nauth:{author}\\ndesc:{desc}\\ndate:{date|gitdate}\\nid:{node|short}\\n" + // NOI18N "file_mods:{files}\\nfile_adds:{file_adds}\\nfile_dels:{file_dels}\\nfile_copies:\\nendCS:\\n"; // NOI18N private static final String GIT_LOG_REVISION_OUT = "rev:"; // NOI18N private static final String GIT_LOG_AUTHOR_OUT = "auth:"; // NOI18N @@ -173,29 +174,19 @@ public class GitCommand { private static final String GIT_PATH_DEFAULT_OPT = "default"; // NOI18N private static final String GIT_PATH_DEFAULT_PUSH_OPT = "default-push"; // NOI18N - - // TODO: replace this hack - // Causes /usr/bin/hgmerge script to return when a merge - // has conflicts with exit 0, instead of throwing up EDITOR. - // Problem is after this Hg thinks the merge succeded and no longer - // marks repository with a merge needed flag. So Plugin needs to - // track this merge required status by changing merge conflict file - // status. If the cache is removed this information would be lost. - // - // Really need Hg to give us back merge status information, - // which it currently does not private static final String GIT_MERGE_CMD = "merge"; // NOI18N private static final String GIT_MERGE_FORCE_CMD = "-f"; // NOI18N private static final String GIT_MERGE_ENV = "EDITOR=success || $TEST -s"; // NOI18N - public static final String GIT_HGK_PATH_SOLARIS10 = "/usr/demo/mercurial"; // NOI18N - private static final String GIT_HGK_PATH_SOLARIS10_ENV = "PATH=/usr/bin/:/usr/sbin:/bin:"+ GIT_HGK_PATH_SOLARIS10; // NOI18N + public static final String GIT_GITK_PATH_SOLARIS10 = "/usr/demo/gitk"; // NOI18N + private static final String GIT_GITK_PATH_SOLARIS10_ENV = "PATH=/usr/bin/:/usr/sbin:/bin:"+ GIT_GITK_PATH_SOLARIS10; // NOI18N private static final String GIT_PULL_CMD = "pull"; // NOI18N private static final String GIT_UPDATE_CMD = "-u"; // NOI18N private static final String GIT_PUSH_CMD = "push"; // NOI18N private static final String GIT_UNBUNDLE_CMD = "unbundle"; // NOI18N private static final String GIT_ROLLBACK_CMD = "rollback"; // NOI18N + private static final String GIT_BACKOUT_CMD = "backout"; // NOI18N private static final String GIT_BACKOUT_MERGE_CMD = "--merge"; // NOI18N private static final String GIT_BACKOUT_COMMIT_MSG_CMD = "-m"; // NOI18N @@ -216,7 +207,7 @@ public class GitCommand { private static final String GIT_FETCH_CMD = "fetch"; // NOI18N public static final String GIT_PROXY_ENV = "http_proxy="; // NOI18N - private static final String GIT_MERGE_NEEDED_ERR = "(run 'hg heads' to see heads, 'hg merge' to merge)"; // NOI18N + private static final String GIT_MERGE_NEEDED_ERR = "(run 'git heads' to see heads, 'git merge' to merge)"; // NOI18N public static final String GIT_MERGE_CONFLICT_ERR = "conflicts detected in "; // NOI18N public static final String GIT_MERGE_CONFLICT_WIN1_ERR = "merging"; // NOI18N public static final String GIT_MERGE_CONFLICT_WIN2_ERR = "failed!"; // NOI18N @@ -228,14 +219,14 @@ public class GitCommand { private static final String GIT_NO_CHANGES_ERR = "no changes found"; // NOI18N private final static String GIT_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote branches!"; // NOI18N private final static String GIT_HEADS_CREATED_ERR = "(+1 heads)"; // NOI18N - private final static String GIT_NO_GIT_CMD_FOUND_ERR = "hg: not found"; + private final static String GIT_NO_GIT_CMD_FOUND_ERR = "git: not found"; private final static String GIT_ARG_LIST_TOO_LONG_ERR = "Arg list too long"; private final static String GIT_HEADS_CMD = "heads"; // NOI18N - private static final String GIT_NO_REPOSITORY_ERR = "There is no Mercurial repository here"; // NOI18N - private static final String GIT_NO_RESPONSE_ERR = "no suitable response from remote hg!"; // NOI18N - private static final String GIT_NOT_REPOSITORY_ERR = "does not appear to be an hg repository"; // NOI18N + private static final String GIT_NO_REPOSITORY_ERR = "There is no Git repository here"; // NOI18N + private static final String GIT_NO_RESPONSE_ERR = "no suitable response from remote git!"; // NOI18N + private static final String GIT_NOT_REPOSITORY_ERR = "does not appear to be an git repository"; // NOI18N private static final String GIT_REPOSITORY = "repository"; // NOI18N private static final String GIT_NOT_FOUND_ERR = "not found!"; // NOI18N private static final String GIT_UPDATE_SPAN_BRANCHES_ERR = "abort: update spans branches"; // NOI18N @@ -256,8 +247,8 @@ public class GitCommand { private static final String GIT_NO_CHANGE_NEEDED_ERR = "no change needed"; // NOI18N private static final String GIT_NO_ROLLBACK_ERR = "no rollback information available"; // NOI18N private static final String GIT_NO_UPDATES_ERR = "0 files updated, 0 files merged, 0 files removed, 0 files unresolved"; // NOI18N - private static final String GIT_NO_VIEW_ERR = "hg: unknown command 'view'"; // NOI18N - private static final String GIT_HGK_NOT_FOUND_ERR = "sh: hgk: not found"; // NOI18N + private static final String GIT_NO_VIEW_ERR = "git: unknown command 'view'"; // NOI18N + private static final String GIT_GITK_NOT_FOUND_ERR = "sh: gitk: not found"; // NOI18N private static final String GIT_NO_SUCH_FILE_ERR = "No such file"; // NOI18N private static final String GIT_NO_REV_STRIP_ERR = "abort: unknown revision"; // NOI18N @@ -266,12 +257,12 @@ public class GitCommand { private static final char GIT_STATUS_CODE_MODIFIED = 'M' + ' '; // NOI18N // STATUS_VERSIONED_MODIFIEDLOCALLY private static final char GIT_STATUS_CODE_ADDED = 'A' + ' '; // NOI18N // STATUS_VERSIONED_ADDEDLOCALLY - private static final char GIT_STATUS_CODE_REMOVED = 'R' + ' '; // NOI18N // STATUS_VERSIONED_REMOVEDLOCALLY - still tracked, hg update will recover, hg commit + private static final char GIT_STATUS_CODE_REMOVED = 'R' + ' '; // NOI18N // STATUS_VERSIONED_REMOVEDLOCALLY - still tracked, git update will recover, git commit private static final char GIT_STATUS_CODE_CLEAN = 'C' + ' '; // NOI18N // STATUS_VERSIONED_UPTODATE - private static final char GIT_STATUS_CODE_DELETED = '!' + ' '; // NOI18N // STATUS_VERSIONED_DELETEDLOCALLY - still tracked, hg update will recover, hg commit no effect + private static final char GIT_STATUS_CODE_DELETED = '!' + ' '; // NOI18N // STATUS_VERSIONED_DELETEDLOCALLY - still tracked, git update will recover, git commit no effect private static final char GIT_STATUS_CODE_NOTTRACKED = '?' + ' '; // NOI18N // STATUS_NOTVERSIONED_NEWLOCALLY - not tracked private static final char GIT_STATUS_CODE_IGNORED = 'I' + ' '; // NOI18N // STATUS_NOTVERSIONED_EXCLUDE - not shown by default - private static final char GIT_STATUS_CODE_CONFLICT = 'X' + ' '; // NOI18N // STATUS_VERSIONED_CONFLICT - TODO when Hg status supports conflict markers + private static final char GIT_STATUS_CODE_CONFLICT = 'X' + ' '; // NOI18N // STATUS_VERSIONED_CONFLICT - TODO when Git status supports conflict markers private static final char GIT_STATUS_CODE_ABORT = 'a' + 'b'; // NOI18N public static final String GIT_STR_CONFLICT_EXT = ".conflict~"; // NOI18N @@ -286,7 +277,7 @@ public class GitCommand { * marked as changed for the next commit and a commit must be * performed before any further updates are allowed. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param Revision to merge with, if null will merge with default tip rev * @return git merge output * @throws GitException @@ -314,12 +305,12 @@ public class GitCommand { * By default, update will refuse to run if doing so would require * merging or discarding local changes. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param Boolean force an Update and overwrite any modified files in the working directory * @param String revision to be updated to * @param Boolean throw exception on error - * @return hg update output - * @throws org.netbeans.modules.mercurial.GitException + * @return git update output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doUpdateAll(File repository, boolean bForce, String revision, boolean bThrowException) throws GitException { if (repository == null ) return null; @@ -352,7 +343,8 @@ public class GitCommand { } /** - * Roll back the last transaction in this repository + * Roll back the last transaction in this repository. + * * Transactions are used to encapsulate the effects of all commands * that create new changesets or propagate existing changesets into a * repository. For example, the following commands are transactional, @@ -361,9 +353,9 @@ public class GitCommand { * unbundle * There is only one level of rollback, and there is no way to undo a rollback. * - * @param File repository of the mercurial repository's root directory - * @return hg update output - * @throws org.netbeans.modules.mercurial.GitException + * @param File repository of the Git repository's root directory + * @return git update output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doRollback(File repository, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -471,29 +463,28 @@ public class GitCommand { return null; } - /** + /** * Pull changes from the default pull locarion and update working directory. * By default, update will refuse to run if doing so would require * merging or discarding local changes. * - * @param File repository of the mercurial repository's root directory - * @return hg pull output - * @throws org.netbeans.modules.mercurial.GitException + * @param File repository of the Git repository's root directory + * @return git pull output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doPull(File repository, OutputLogger logger) throws GitException { return doPull(repository, null, logger); } - /** - * Pull changes from the specified repository and - * update working directory. + /** + * Pull changes from the specified repository and update working directory. * By default, update will refuse to run if doing so would require * merging or discarding local changes. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param String source repository to pull from - * @return hg pull output - * @throws org.netbeans.modules.mercurial.GitException + * @return git pull output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doPull(File repository, String from, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -532,10 +523,10 @@ public class GitCommand { * By default, update will refuse to run if doing so would require * merging or discarding local changes. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File bundle identfies the compressed changegroup file to be applied - * @return hg unbundle output - * @throws org.netbeans.modules.mercurial.GitException + * @return git unbundle output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doUnbundle(File repository, File bundle, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -562,9 +553,9 @@ public class GitCommand { * Show the changesets that would be pulled if a pull * was requested from the default pull location * - * @param File repository of the mercurial repository's root directory - * @return hg incoming output - * @throws org.netbeans.modules.mercurial.GitException + * @param File repository of the Git repository's root directory + * @return git incoming output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doIncoming(File repository, OutputLogger logger) throws GitException { return doIncoming(repository, null, null, logger); @@ -574,11 +565,11 @@ public class GitCommand { * Show the changesets that would be pulled if a pull * was requested from the specified repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param String source repository to query * @param File bundle to store downloaded changesets. - * @return hg incoming output - * @throws org.netbeans.modules.mercurial.GitException + * @return git incoming output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doIncoming(File repository, String from, File bundle, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -619,10 +610,10 @@ public class GitCommand { * Show the changesets that would be pushed if a push * was requested to the specified local source repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param String source repository to query - * @return hg outgoing output - * @throws org.netbeans.modules.mercurial.GitException + * @return git outgoing output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doOutgoing(File repository, String to, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -656,10 +647,10 @@ public class GitCommand { * Push changes to the specified repository * By default, push will refuse to run if doing so would create multiple heads * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param String source repository to push to - * @return hg push output - * @throws org.netbeans.modules.mercurial.GitException + * @return git push output + * @throws org.netbeans.modules.git.GitException */ public static List<String> doPush(File repository, String to, OutputLogger logger) throws GitException { if (repository == null || to == null ) return null; @@ -692,10 +683,10 @@ public class GitCommand { } /** - * Run the command hg view for the specified repository + * Run the command git view for the specified repository * - * @param File repository of the mercurial repository's root directory - * @throws org.netbeans.modules.mercurial.GitException + * @param File repository of the Git repository's root directory + * @throws org.netbeans.modules.git.GitException */ public static List<String> doView(File repository, OutputLogger logger) throws GitException { if (repository == null) return null; @@ -710,7 +701,7 @@ public class GitCommand { List<String> list; if(GitUtils.isSolaris()){ - env.add(GIT_HGK_PATH_SOLARIS10_ENV); + env.add(GIT_GITK_PATH_SOLARIS10_ENV); list = execEnv(command, env); }else{ list = exec(command); @@ -721,7 +712,7 @@ public class GitCommand { throw new GitException(NbBundle.getMessage(GitCommand.class, "MSG_WARN_NO_VIEW_TEXT")); } else if (isErrorGitkNotFound(list.get(0))) { - throw new GitException(NbBundle.getMessage(GitCommand.class, "MSG_WARN_HGK_NOT_FOUND_TEXT")); + throw new GitException(NbBundle.getMessage(GitCommand.class, "MSG_WARN_GITK_NOT_FOUND_TEXT")); } else if (isErrorAbort(list.get(list.size() -1))) { handleError(command, list, NbBundle.getMessage(GitCommand.class, "MSG_COMMAND_ABORTED"), logger); } @@ -763,10 +754,10 @@ public class GitCommand { return proxy; } /** - * Run the fetch extension for the specified repository + * Run the fetch extension for the specified repository. * - * @param File repository of the mercurial repository's root directory - * @throws org.netbeans.modules.mercurial.GitException + * @param File repository of the Git repository's root directory + * @throws org.netbeans.modules.git.GitException */ public static List<String> doFetch(File repository, OutputLogger logger) throws GitException { if (repository == null) return null; @@ -908,7 +899,7 @@ public class GitCommand { /** * Determines whether repository requires a merge - has more than 1 heads * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Boolean which is true if the repository needs a merge */ public static Boolean isMergeRequired(File repository) { @@ -932,7 +923,7 @@ public class GitCommand { /** * Determines whether anything has been committed to the repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Boolean which is true if the repository has revision history. */ public static Boolean hasHistory(File repository) { @@ -958,12 +949,13 @@ public class GitCommand { } /** - * Determines the previous name of the specified file + * Determines the previous name of the specified file. + * * We make the assumption that the previous file name is in the - * list of files returned by hg log command immediately befor + * list of files returned by git log command immediately befor * the file we started with. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File file of the file whose previous name is required * @param String revision which the revision to start from. * @return File for the previous name of the file @@ -1006,10 +998,10 @@ public class GitCommand { /** * Retrives the log information with just first line of commit message for the specified file. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File of file which revision history is to be retrieved. * @return List<String> list of the log entries for the specified file. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doLogShort(File repository, File file, OutputLogger logger) throws GitException { return doLog(repository, file, GIT_LOG_TEMPLATE_SHORT_CMD, false, logger); @@ -1018,10 +1010,10 @@ public class GitCommand { /** * Retrives the log information with the full commit message for the specified file. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File of file which revision history is to be retrieved. * @return List<String> list of the log entries for the specified file. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doLogLong(File repository, File file, OutputLogger logger) throws GitException { return doLog(repository, file, GIT_LOG_TEMPLATE_LONG_CMD, false, logger); @@ -1030,12 +1022,12 @@ public class GitCommand { /** * Retrives the log information for the specified file, as defined by the LOG_TEMPLATE. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File of file which revision history is to be retrieved. * @param String Template specifying how output should be returned * @param boolean flag indicating if debug param should be used - required to get all file mod, add, del info * @return List<String> list of the log entries for the specified file. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doLog(File repository, File file, String LOG_TEMPLATE, boolean bDebug, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -1069,12 +1061,12 @@ public class GitCommand { /** * Retrives the log information for the specified files. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param List<File> of files which revision history is to be retrieved. * @param String Template specifying how output should be returned * @param boolean flag indicating if debug param should be used - required to get all file mod, add, del info * @return List<String> list of the log entries for the specified file. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doLog(File repository, List<File> files, String LOG_TEMPLATE, boolean bDebug, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -1125,12 +1117,12 @@ public class GitCommand { /** * Retrives the log information for the specified files. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param List<File> of files which revision history is to be retrieved. * @param String Template specifying how output should be returned * @param boolean flag indicating if debug param should be used - required to get all file mod, add, del info * @return List<String> list of the log entries for the specified file. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doLogForHistory(File repository, List<File> files, String from, String to, String headRev, boolean bShowMerges, OutputLogger logger) throws GitException { @@ -1192,9 +1184,9 @@ public class GitCommand { /** * Retrives the Out information for the specified repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return List<String> list of the out entries for the specified repo. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doOut(File repository, boolean bShowMerges, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -1237,9 +1229,9 @@ public class GitCommand { /** * Retrives the Incoming changeset information for the specified repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return List<String> list of the out entries for the specified repo. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doIncomingForSearch(File repository, String to, boolean bShowMerges, OutputLogger logger) throws GitException { if (repository == null ) return null; @@ -1424,10 +1416,10 @@ public class GitCommand { * Retrieves the base revision of the specified file to the * specified output file. * - * @param File repository of the mercurial repository's root directory - * @param File file in the mercurial repository + * @param File repository of the Git repository's root directory + * @param File file in the Git repository * @param File outFile to contain the contents of the file - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doCat(File repository, File file, File outFile, OutputLogger logger) throws GitException { doCat(repository, file, outFile, "tip", false, logger); //NOI18N @@ -1437,13 +1429,13 @@ public class GitCommand { * Retrieves the specified revision of the specified file to the * specified output file. * - * @param File repository of the mercurial repository's root directory - * @param File file in the mercurial repository + * @param File repository of the Git repository's root directory + * @param File file in the Git repository * @param File outFile to contain the contents of the file * @param String of revision for the revision of the file to be * printed to the output file. * @return List<String> list of all the log entries - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doCat(File repository, File file, File outFile, String revision, OutputLogger logger) throws GitException { doCat(repository, file, outFile, revision, true, logger); //NOI18N @@ -1491,9 +1483,9 @@ public class GitCommand { * directory does not exist, it is created. Will throw a GitException * if the repository already exists. * - * @param root for the mercurial repository + * @param root for the Git repository * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doCreate(File root, OutputLogger logger) throws GitException { if (root == null ) return; @@ -1511,10 +1503,10 @@ public class GitCommand { /** * Clone an exisiting repository to the specified target directory * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param target directory to clone to * @return clone output - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doClone(File repository, String target, OutputLogger logger) throws GitException { if (repository == null) return null; @@ -1524,10 +1516,10 @@ public class GitCommand { /** * Clone a repository to the specified target directory * - * @param String repository of the mercurial repository + * @param String repository of the Git repository * @param target directory to clone to * @return clone output - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doClone(String repository, String target, OutputLogger logger) throws GitException { if (repository == null || target == null) return null; @@ -1551,8 +1543,8 @@ public class GitCommand { command.add(getGitCommand()); command.add(GIT_CLONE_CMD); command.add(GIT_VERBOSE_CMD); - // Workaround for http://www.selenic.com/mercurial/bts/issue776 - // Strip off file:// from start of repository + + // TODO: Remove this for Git Port if (repository.startsWith("file://")) { command.add(repository.substring(7)); } else { @@ -1574,13 +1566,13 @@ public class GitCommand { } /** - * Commits the list of Locally Changed files to the mercurial Repository + * Commits the list of Locally Changed files to the Git Repository * - * @param File repository of the mercurial repository's root directory - * @param List<files> of files to be committed to hg + * @param File repository of the Git repository's root directory + * @param List<files> of files to be committed to Git * @param String for commitMessage * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doCommit(File repository, List<File> commitFiles, String commitMessage, OutputLogger logger) throws GitException { List<String> command = new ArrayList<String>(); @@ -1641,14 +1633,14 @@ public class GitCommand { /** * Rename a source file to a destination file. - * mercurial hg rename + * git mv * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File of sourceFile which was renamed * @param File of destFile to which sourceFile has been renaned * @param boolean whether to do a rename --after * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doRename(File repository, File sourceFile, File destFile, OutputLogger logger) throws GitException { doRename(repository, sourceFile, destFile, false, logger); @@ -1681,27 +1673,27 @@ public class GitCommand { /** * Mark a source file as having been renamed to a destination file. - * mercurial hg rename -A. + * git mv -A. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File of sourceFile which was renamed * @param File of destFile to which sourceFile has been renaned * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doRenameAfter(File repository, File sourceFile, File destFile, OutputLogger logger) throws GitException { doRename(repository, sourceFile, destFile, true, logger); } /** - * Adds the list of Locally New files to the mercurial Repository + * Adds the list of Locally New files to the Git Repository. * Their status will change to added and they will be added on the next - * mercurial hg add. + * git add. * - * @param File repository of the mercurial repository's root directory - * @param List<Files> of files to be added to hg + * @param File repository of the Git repository's root directory + * @param List<Files> of files to be added to Git * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doAdd(File repository, List<File> addFiles, OutputLogger logger) throws GitException { if (repository == null) return; @@ -1726,13 +1718,13 @@ public class GitCommand { } /** - * Reverts the list of files in the mercurial Repository to the specified revision + * Reverts the list of files in the Git Repository to the specified revision * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param List<Files> of files to be reverted * @param String revision to be reverted to * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doRevert(File repository, List<File> revertFiles, String revision, boolean doBackup, OutputLogger logger) throws GitException { @@ -1762,14 +1754,14 @@ public class GitCommand { } /** - * Adds a Locally New file to the mercurial Repository + * Adds a Locally New file to the Git Repository * The status will change to added and they will be added on the next - * mercurial hg commit. + * git commit. * - * @param File repository of the mercurial repository's root directory - * @param File of file to be added to hg + * @param File repository of the Git repository's root directory + * @param File of file to be added to Git * @return void - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doAdd(File repository, File file, OutputLogger logger) throws GitException { if (repository == null) return; @@ -1794,11 +1786,11 @@ public class GitCommand { /** * Get the annotations for the specified file * - * @param File repository of the mercurial repository + * @param File repository of the Git repository * @param File file to be annotated * @param String revision of the file to be annotated * @return List<String> list of the annotated lines of the file - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doAnnotate(File repository, File file, String revision, OutputLogger logger) throws GitException { if (repository == null) return null; @@ -1823,7 +1815,7 @@ public class GitCommand { handleError(command, list, NbBundle.getMessage(GitCommand.class, "MSG_NO_REPOSITORY_ERR"), logger); } else if (isErrorNoSuchFile(list.get(0))) { // This can happen if we have multiple heads and the wrong - // one was picked by default hg annotation + // one was picked by default git annotation if (revision == null) { String rev = getLastRevision(repository, file); if (rev != null) { @@ -1846,7 +1838,7 @@ public class GitCommand { /** * Get the revisions this file has been modified in. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param files to query revisions for * @param Int limit on nunmber of revisions (-1 for no limit) * @return List<String> list of the revisions of the file - {<rev>:<short cset hash>} @@ -1883,7 +1875,7 @@ public class GitCommand { /** * Get the revisions for a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return List<String> list of the revisions of the repository - {<rev>:<short cset hash>} * or null if no commits made yet. */ @@ -1894,9 +1886,9 @@ public class GitCommand { /** * Get the pull default for the specified repository, i.e. the default - * destination for hg pull commmands. + * destination for git pull commmands. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return String for pull default */ public static String getPullDefault(File repository) { @@ -1905,9 +1897,9 @@ public class GitCommand { /** * Get the push default for the specified repository, i.e. the default - * destination for hg push commmands. + * destination for git push commmands. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return String for push default */ public static String getPushDefault(File repository) { @@ -1940,11 +1932,11 @@ public class GitCommand { } /** - * Returns the mercurial branch name if any for a repository + * Returns the Git branch name if any for a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @return String branch name or null if not named - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static String getBranchName(File repository) throws GitException { if (repository == null) return null; @@ -1965,11 +1957,11 @@ public class GitCommand { } /** - * Returns the mercurial branch revision for a repository + * Returns the Git branch revision for a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return int value of revision for repository tip - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static int getBranchRev(File repository) throws GitException { if (repository == null) return -1; @@ -1991,11 +1983,11 @@ public class GitCommand { } /** - * Returns the mercurial branch name if any for a repository + * Returns the Git branch name if any for a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @return String branch short change set hash - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static String getBranchShortChangesetHash(File repository) throws GitException { if (repository == null) return null; @@ -2016,11 +2008,11 @@ public class GitCommand { } } /** - * Returns the mercurial branch info for a repository + * Returns the Git branch info for a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @return String of form :<branch>:<rev>:<shortchangeset>: - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static String getBranchInfo(File repository) throws GitException { if (repository == null) return null; @@ -2044,9 +2036,9 @@ public class GitCommand { /** * Returns the revision number for the heads in a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return List<String> of revision numbers. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> getHeadRevisions(File repository) throws GitException { return getHeadInfo(repository, GIT_REV_TEMPLATE_CMD); @@ -2055,9 +2047,9 @@ public class GitCommand { /** * Returns the revision number for the heads in a repository * - * @param String repository of the mercurial repository + * @param String repository of the Git repository * @return List<String> of revision numbers. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> getHeadRevisions(String repository) throws GitException { return getHeadInfo(repository, GIT_REV_TEMPLATE_CMD); @@ -2066,10 +2058,10 @@ public class GitCommand { /** * Returns the changeset for the the heads in a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File file of the file whose last changeset is to be returned. * @return List<String> of changeset ids. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> getHeadChangeSetIds(File repository) throws GitException { return getHeadInfo(repository, GIT_CSET_TARGET_TEMPLATE_CMD); @@ -2097,10 +2089,10 @@ public class GitCommand { /** * Returns the revision number for the last change to a file * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File file of the file whose last revision number is to be returned, if null test for repo * @return String in the form of a revision number. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static String getLastRevision(File repository, File file) throws GitException { return getLastChange(repository, file, GIT_REV_TEMPLATE_CMD); @@ -2109,10 +2101,10 @@ public class GitCommand { /** * Returns the changeset for the last change to a file * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File file of the file whose last changeset is to be returned. * @return String in the form of a changeset id. - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static String getLastChangeSetId(File repository, File file) throws GitException { return getLastChange(repository, file, GIT_CSET_TEMPLATE_CMD); @@ -2143,13 +2135,13 @@ public class GitCommand { /** - * Returns the mercurial status for a given file + * Returns the Git status for a given file * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @param cwd current working directory containing file to be checked * @param filename name of file whose status is to be checked * @return FileInformation for the given filename - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static FileInformation getSingleStatus(File repository, String cwd, String filename) throws GitException{ FileInformation info = null; @@ -2191,86 +2183,86 @@ public class GitCommand { } /** - * Returns the mercurial status for all files in a given subdirectory of + * Returns the Git status for all files in a given subdirectory of * a repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @param File dir of the subdirectoy of interest. * @return Map of files and status for all files in the specified subdirectory - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getAllStatus(File repository, File dir) throws GitException{ return getDirStatusWithFlags(repository, dir, GIT_STATUS_FLAG_ALL_CMD, true); } /** - * Returns the mercurial status for all files in a given repository + * Returns the git status for all files in a given repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Map of files and status for all files under the repository root - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getAllStatus(File repository) throws GitException{ return getAllStatusWithFlags(repository, GIT_STATUS_FLAG_ALL_CMD, true); } /** - * Returns the mercurial status for only files of interest to us in a given repository + * Returns the git status for only files of interest to us in a given repository * that is modified, locally added, locally removed, locally deleted, locally new and ignored. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Map of files and status for all files of interest under the repository root - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getAllInterestingStatus(File repository) throws GitException{ return getAllStatusWithFlags(repository, GIT_STATUS_FLAG_INTERESTING_CMD, true); } /** - * Returns the mercurial status for only files of interest to us in a given directory in a repository + * Returns the git status for only files of interest to us in a given directory in a repository * that is modified, locally added, locally removed, locally deleted, locally new and ignored. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File dir of the directory of interest * @return Map of files and status for all files of interest in the directory of interest - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getInterestingStatus(File repository, File dir) throws GitException{ return getDirStatusWithFlags(repository, dir, GIT_STATUS_FLAG_INTERESTING_CMD, true); } /** - * Returns the mercurial status for only files of interest to us in a given repository + * Returns the git status for only files of interest to us in a given repository * that is modified, locally added, locally removed, locally deleted, locally new and ignored. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Map of files and status for all files of interest under the repository root - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getAllRemovedDeletedStatus(File repository) throws GitException{ return getAllStatusWithFlags(repository, GIT_STATUS_FLAG_REM_DEL_CMD, true); } /** - * Returns the mercurial status for only files of interest to us in a given directory in a repository + * Returns the git status for only files of interest to us in a given directory in a repository * that is modified, locally added, locally removed, locally deleted, locally new and ignored. * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File dir of the directory of interest * @return Map of files and status for all files of interest in the specified directory - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getRemovedDeletedStatus(File repository, File dir) throws GitException{ return getDirStatusWithFlags(repository, dir, GIT_STATUS_FLAG_REM_DEL_CMD, true); } /** - * Returns the unknown files in a specified directory under a mercurial repository root + * Returns the unknown files in a specified directory under a Git repository root * - * @param File of the mercurial repository's root directory + * @param File of the Git repository's root directory * @param File of the directory whose files are required * @return Map of files and status for all files under the repository root - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getUnknownStatus(File repository, File dir) throws GitException{ Map<File, FileInformation> files = getDirStatusWithFlags(repository, dir, GIT_STATUS_FLAG_UNKNOWN_CMD, false); @@ -2286,23 +2278,23 @@ public class GitCommand { } /** - * Returns the unknown files under a mercurial repository root + * Returns the unknown files under a Git repository root * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @return Map of files and status for all files under the repository root - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static Map<File, FileInformation> getAllUnknownStatus(File repository) throws GitException{ return getUnknownStatus(repository, null); } /** - * Remove the specified file from the mercurial Repository + * Remove the specified file from the Git Repository * - * @param File repository of the mercurial repository's root directory - * @param List<Files> of files to be added to hg + * @param File repository of the Git repository's root directory + * @param List<Files> of files to be added to Git * @param f path to be removed from the repository - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doRemove(File repository, List<File> removeFiles, OutputLogger logger) throws GitException { List<String> command = new ArrayList<String>(); @@ -2322,11 +2314,11 @@ public class GitCommand { } /** - * Remove the specified files from the mercurial Repository + * Remove the specified files from the Git Repository * - * @param File repository of the mercurial repository's root directory + * @param File repository of the git repository's root directory * @param f path to be removed from the repository - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static void doRemove(File repository, File f, OutputLogger logger) throws GitException { List<String> command = new ArrayList<String>(); @@ -2348,10 +2340,10 @@ public class GitCommand { /** * Export the diffs for the specified revision to the specified output file * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param revStr the revision whose diffs are to be exported * @param outputFileName path of the output file - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doExport(File repository, String revStr, String outputFileName, OutputLogger logger) throws GitException { // Ensure that parent directory of target exists, creating if necessary @@ -2390,9 +2382,9 @@ public class GitCommand { /** * Imports the diffs from the specified file * - * @param File repository of the mercurial repository's root directory + * @param File repository of the Git repository's root directory * @param File patchFile of the patch file - * @throws org.netbeans.modules.mercurial.GitException + * @throws org.netbeans.modules.git.GitException */ public static List<String> doImport(File repository, File patchFile, OutputLogger logger) throws GitException { List<String> command = new ArrayList<String>(); @@ -2416,7 +2408,7 @@ public class GitCommand { } /** - * Returns Map of mercurial file and status for files in a given repository as specified by the status flags + * Returns Map of Git file and status for files in a given repository as specified by the status flags */ private static Map<File, FileInformation> getAllStatusWithFlags(File repository, String statusFlags, boolean bIgnoreUnversioned) throws GitException{ return getDirStatusWithFlags(repository, null, statusFlags, bIgnoreUnversioned); @@ -2486,7 +2478,7 @@ public class GitCommand { } /** - * Gets file information for a given hg status output status line + * Gets file information for a given git status output status line */ private static FileInformation getFileInformationFromStatusLine(String status){ FileInformation info = null; @@ -2532,7 +2524,7 @@ public class GitCommand { } /** - * Gets hg status command output line for a given file + * Gets git status command output line for a given file */ private static List<String> doSingleStatusCmd(File repository, String cwd, String filename) throws GitException{ String statusLine = null; @@ -2547,16 +2539,14 @@ public class GitCommand { command.add(GIT_OPT_CWD_CMD); command.add(repository.getAbsolutePath()); - // In 0.9.3 hg status does not give back copy information unless we - // use relative paths from repository. This is fixed in 0.9.4. - // See http://www.selenic.com/mercurial/bts/issue545. + command.add(new File(cwd, filename).getAbsolutePath().substring(repository.getAbsolutePath().length()+1)); return exec(command); } /** - * Gets hg status command output list for the specified status flags for a given repository and directory + * Gets git status command output list for the specified status flags for a given repository and directory */ private static List<String> doRepositoryDirStatusCmd(File repository, File dir, String statusFlags) throws GitException{ List<String> command = new ArrayList<String>(); @@ -2586,13 +2576,13 @@ public class GitCommand { } return list; } + /** * Returns the ouput from the given command * * @param command to execute * @return List of the command's output or an exception if one occured */ - private static List<String> execEnv(List<String> command, List<String> env) throws GitException{ if( EventQueue.isDispatchThread()){ Git.LOG.log(Level.FINE, "WARNING execEnv(): calling Git command in AWT Thread - could stall UI"); // NOI18N @@ -2876,7 +2866,7 @@ public class GitCommand { } private static boolean isErrorGitkNotFound(String msg) { - return msg.indexOf(GIT_HGK_NOT_FOUND_ERR) > -1; // NOI18N + return msg.indexOf(GIT_GITK_NOT_FOUND_ERR) > -1; // NOI18N } private static boolean isErrorNoSuchFile(String msg) { src/org/netbeans/modules/git/util/GitCommand.java @@ -44,10 +44,9 @@ package org.netbeans.modules.git.util; import java.util.Date; /** - * A class to encapsulate the parts of the hg log message we are interested in. + * Class to encapsulate the parts of the git log message we are interested in. * * @author Padraig O'Briain - * @author alexbcoles */ public class GitLogMessage { src/org/netbeans/modules/git/util/GitLogMessage.java @@ -63,7 +63,11 @@ import org.openide.util.lookup.Lookups; import org.openide.windows.TopComponent; import org.openide.windows.WindowManager; - +/** + * Class to handle various aspects of NetBeans Project management. + * + * @author alexbcoles + */ public class GitProjectUtils { private static final String ProjectTab_ID_LOGICAL = "projectTabLogical_tc"; // NOI18N src/org/netbeans/modules/git/util/GitProjectUtils.java @@ -45,6 +45,10 @@ import java.io.File; import java.util.Set; import org.netbeans.modules.versioning.spi.VCSContext; +/** + * + * @author alexbcoles + */ public class GitRepositoryContextCache { private static boolean hasHistory; src/org/netbeans/modules/git/util/GitRepositoryContextCache.java @@ -96,24 +96,25 @@ import org.openide.windows.TopComponent; /** * * @author jrice + * @author alexbcoles */ public class GitUtils { private static final Pattern httpPasswordPattern = Pattern.compile("(https*://)(\\w+\\b):(\\b\\S*)@"); //NOI18N private static final String httpPasswordReplacementStr = "$1$2:\\*\\*\\*\\*@"; //NOI18N - private static final Pattern metadataPattern = Pattern.compile(".*\\" + File.separatorChar + "(\\.)hg(\\" + File.separatorChar + ".*|$)"); // NOI18N + private static final Pattern metadataPattern = Pattern.compile(".*\\" + File.separatorChar + "(\\.)git(\\" + File.separatorChar + ".*|$)"); // NOI18N - // IGNORE SUPPORT HG: following file patterns are added to {Hg repos}/.hgignore and Hg will ignore any files + // IGNORE SUPPORT GIT: following file patterns are added to {Git repos}/.gitignore and Git will ignore any files // that match these patterns, reporting "I"status for them // NOI18N - private static final String [] HG_IGNORE_FILES = { "\\.orig$", "\\.orig\\..*$", "\\.chg\\..*$", "\\.rej$", "\\.conflict\\~$"}; // NOI18N - private static final String HG_IGNORE_ORIG_FILES = "\\.orig$"; // NOI18N - private static final String HG_IGNORE_ORIG_ANY_FILES = "\\.orig\\..*$"; // NOI18N - private static final String HG_IGNORE_CHG_ANY_FILES = "\\.chg\\..*$"; // NOI18N - private static final String HG_IGNORE_REJ_ANY_FILES = "\\.rej$"; // NOI18N - private static final String HG_IGNORE_CONFLICT_ANY_FILES = "\\.conflict\\~$"; // NOI18N + private static final String [] GIT_IGNORE_FILES = { "\\.orig$", "\\.orig\\..*$", "\\.chg\\..*$", "\\.rej$", "\\.conflict\\~$"}; // NOI18N + private static final String GIT_IGNORE_ORIG_FILES = "\\.orig$"; // NOI18N + private static final String GIT_IGNORE_ORIG_ANY_FILES = "\\.orig\\..*$"; // NOI18N + private static final String GIT_IGNORE_CHG_ANY_FILES = "\\.chg\\..*$"; // NOI18N + private static final String GIT_IGNORE_REJ_ANY_FILES = "\\.rej$"; // NOI18N + private static final String GIT_IGNORE_CONFLICT_ANY_FILES = "\\.conflict\\~$"; // NOI18N - private static final String FILENAME_HGIGNORE = ".hgignore"; // NOI18N + private static final String FILENAME_GITIGNORE = ".gitignore"; // NOI18N private static HashMap<String, Set<Pattern>> ignorePatterns; @@ -128,7 +129,8 @@ public class GitUtils { c.setTime(date); c.add(Calendar.DATE, days); return c.getTime(); - } + } + /** * getTodaysDateStr - return todays date as a YYYY-MM-DD string * @@ -137,7 +139,8 @@ public class GitUtils { public static String getTodaysDateStr() { Date todaysDate = new Date(); return new SimpleDateFormat("yyyy-MM-dd").format(todaysDate); // NOI18N - } + } + /** * getLastWeeksDateStr - return last weeks date as a YYYY-MM-DD string * @@ -147,10 +150,6 @@ public class GitUtils { Date lastWeeksDate = GitUtils.addDaysToDate(new Date(), -7); return new SimpleDateFormat("yyyy-MM-dd").format(lastWeeksDate); // NOI18N } - - public static boolean isPartOfGitMetadata(File file) { - throw new UnsupportedOperationException("Not yet implemented"); - } /** * isSolaris - check you are running onthe Solaris OS @@ -203,7 +202,7 @@ public class GitUtils { String[] paths = pathEnv.split(pathSeparator); for (String path : paths) { File f = new File(path, name); - // On Windows isFile will fail on hgk.cmd use !isDirectory + // On Windows isFile will fail on gitk.cmd use !isDirectory if (f.exists() && !f.isDirectory()) { return true; } @@ -257,16 +256,16 @@ public class GitUtils { return path; } /** - * isLocallyAdded - checks to see if this file has been Locally Added to Hg + * isLocallyAdded - checks to see if this file has been Locally Added to Git * * @param file to check * @return boolean true - ignore, false - not ignored */ public static boolean isLocallyAdded(File file){ if (file == null) return false; - Git hg = Git.getInstance(); + Git git = Git.getInstance(); - if ((hg.getFileStatusCache().getStatus(file).getStatus() & FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) !=0) + if ((git.getFileStatusCache().getStatus(file).getStatus() & FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) !=0) return true; else return false; @@ -295,7 +294,7 @@ public class GitUtils { } /** - * isIgnored - checks to see if this is a file Hg should ignore + * isIgnored - checks to see if this is a file Git should ignore * * @param File file to check * @return boolean true - ignore, false - not ignored @@ -332,7 +331,7 @@ public class GitUtils { } } - if (FILENAME_HGIGNORE.equals(name)) return false; + if (FILENAME_GITIGNORE.equals(name)) return false; if (checkSharability) { int sharability = SharabilityQuery.getSharability(file); if (sharability == SharabilityQuery.NOT_SHARABLE) return true; @@ -341,25 +340,25 @@ public class GitUtils { } /** - * createIgnored - creates .hgignore file in the repository in which - * the given file belongs. This .hgignore file ensures Hg will ignore - * the files specified in HG_IGNORE_FILES list + * createIgnored - creates .gitignore file in the repository in which + * the given file belongs. This .ignore file ensures Git will ignore + * the files specified in GIT_IGNORE_FILES list * - * @param path to repository to place .hgignore file + * @param path to repository to place .gitignore file */ public static void createIgnored(File path){ if( path == null) return; BufferedWriter fileWriter = null; - Git hg = Git.getInstance(); - File root = hg.getTopmostManagedParent(path); + Git git = Git.getInstance(); + File root = git.getTopmostManagedParent(path); if( root == null) return; - File ignore = new File(root, FILENAME_HGIGNORE); + File ignore = new File(root, FILENAME_GITIGNORE); try { if (!ignore.exists()) { fileWriter = new BufferedWriter( new OutputStreamWriter(new FileOutputStream(ignore))); - for (String name : HG_IGNORE_FILES) { + for (String name : GIT_IGNORE_FILES) { fileWriter.write(name + "\n"); // NOI18N } }else{ @@ -371,7 +370,7 @@ public class GitUtils { }finally { try { if(fileWriter != null) fileWriter.close(); - hg.getFileStatusCache().refresh(ignore, FileStatusCache.REPOSITORY_STATUS_UNKNOWN); + git.getFileStatusCache().refresh(ignore, FileStatusCache.REPOSITORY_STATUS_UNKNOWN); } catch (IOException ex) { Git.LOG.log(Level.FINE, "createIgnored(): File {0} - {1}", // NOI18N new Object[] {ignore.getAbsolutePath(), ex.toString()}); @@ -379,9 +378,9 @@ public class GitUtils { } } - private static int HG_NUM_PATTERNS_TO_CHECK = 5; - private static void addToExistingIgnoredFile(File hgignoreFile) { - if(hgignoreFile == null || !hgignoreFile.exists() || !hgignoreFile.canWrite()) return; + private static int GIT_NUM_PATTERNS_TO_CHECK = 5; + private static void addToExistingIgnoredFile(File gitIgnoreFile) { + if(gitIgnoreFile == null || !gitIgnoreFile.exists() || !gitIgnoreFile.canWrite()) return; File tempFile = null; BufferedReader br = null; PrintWriter pw = null; @@ -391,28 +390,28 @@ public class GitUtils { boolean bRejAnyPresent = false; boolean bConflictAnyPresent = false; - // If new patterns are added to HG_IGNORE_FILES, following code needs to + // If new patterns are added to GIT_IGNORE_FILES, following code needs to // check for these new patterns - assert( HG_IGNORE_FILES.length == HG_NUM_PATTERNS_TO_CHECK); + assert( GIT_IGNORE_FILES.length == GIT_NUM_PATTERNS_TO_CHECK); try { - tempFile = new File(hgignoreFile.getAbsolutePath() + ".tmp"); // NOI18N + tempFile = new File(gitIgnoreFile.getAbsolutePath() + ".tmp"); // NOI18N if (tempFile == null) return; - br = new BufferedReader(new FileReader(hgignoreFile)); + br = new BufferedReader(new FileReader(gitIgnoreFile)); pw = new PrintWriter(new FileWriter(tempFile)); String line = null; while ((line = br.readLine()) != null) { - if(!bOrigAnyPresent && line.equals(HG_IGNORE_ORIG_ANY_FILES)){ + if(!bOrigAnyPresent && line.equals(GIT_IGNORE_ORIG_ANY_FILES)){ bOrigAnyPresent = true; - }else if (!bOrigPresent && line.equals(HG_IGNORE_ORIG_FILES)){ + }else if (!bOrigPresent && line.equals(GIT_IGNORE_ORIG_FILES)){ bOrigPresent = true; - }else if (!bChgAnyPresent && line.equals(HG_IGNORE_CHG_ANY_FILES)){ + }else if (!bChgAnyPresent && line.equals(GIT_IGNORE_CHG_ANY_FILES)){ bChgAnyPresent = true; - }else if (!bRejAnyPresent && line.equals(HG_IGNORE_REJ_ANY_FILES)){ + }else if (!bRejAnyPresent && line.equals(GIT_IGNORE_REJ_ANY_FILES)){ bRejAnyPresent = true; - }else if (!bConflictAnyPresent && line.equals(HG_IGNORE_CONFLICT_ANY_FILES)){ + }else if (!bConflictAnyPresent && line.equals(GIT_IGNORE_CONFLICT_ANY_FILES)){ bConflictAnyPresent = true; } pw.println(line); @@ -420,23 +419,23 @@ public class GitUtils { } // If not found add as required if (!bOrigAnyPresent) { - pw.println(HG_IGNORE_ORIG_ANY_FILES ); + pw.println(GIT_IGNORE_ORIG_ANY_FILES ); pw.flush(); } if (!bOrigPresent) { - pw.println(HG_IGNORE_ORIG_FILES ); + pw.println(GIT_IGNORE_ORIG_FILES ); pw.flush(); } if (!bChgAnyPresent) { - pw.println(HG_IGNORE_CHG_ANY_FILES ); + pw.println(GIT_IGNORE_CHG_ANY_FILES ); pw.flush(); } if (!bRejAnyPresent) { - pw.println(HG_IGNORE_REJ_ANY_FILES ); + pw.println(GIT_IGNORE_REJ_ANY_FILES ); pw.flush(); } if (!bConflictAnyPresent) { - pw.println(HG_IGNORE_CONFLICT_ANY_FILES ); + pw.println(GIT_IGNORE_CONFLICT_ANY_FILES ); pw.flush(); } @@ -454,9 +453,9 @@ public class GitUtils { tempFile.delete(); return; } - if(tempFile != null && tempFile.isFile() && tempFile.canWrite() && hgignoreFile != null){ - hgignoreFile.delete(); - tempFile.renameTo(hgignoreFile); + if(tempFile != null && tempFile.isFile() && tempFile.canWrite() && gitIgnoreFile != null){ + gitIgnoreFile.delete(); + tempFile.renameTo(gitIgnoreFile); } }else{ tempFile.delete(); @@ -490,15 +489,15 @@ public class GitUtils { } private static Boolean ignoreContainsSyntax(File directory) throws IOException { - File hgIgnore = new File(directory, FILENAME_HGIGNORE); + File gitIgnore = new File(directory, FILENAME_GITIGNORE); Boolean val = false; - if (!hgIgnore.canRead()) return val; + if (!gitIgnore.canRead()) return val; String s; BufferedReader r = null; try { - r = new BufferedReader(new FileReader(hgIgnore)); + r = new BufferedReader(new FileReader(gitIgnore)); while ((s = r.readLine()) != null) { String line = s.trim(); int indexOfHash = line.indexOf("#"); @@ -520,15 +519,15 @@ public class GitUtils { } private static Set<String> readIgnoreEntries(File directory) throws IOException { - File hgIgnore = new File(directory, FILENAME_HGIGNORE); + File gitIgnore = new File(directory, FILENAME_GITIGNORE); Set<String> entries = new HashSet<String>(5); - if (!hgIgnore.canRead()) return entries; + if (!gitIgnore.canRead()) return entries; String s; BufferedReader r = null; try { - r = new BufferedReader(new FileReader(hgIgnore)); + r = new BufferedReader(new FileReader(gitIgnore)); while ((s = r.readLine()) != null) { String line = s.trim(); if (line.length() == 0) continue; @@ -554,8 +553,8 @@ public class GitUtils { } private static void writeIgnoreEntries(File directory, Set entries) throws IOException { - File hgIgnore = new File(directory, FILENAME_HGIGNORE); - FileObject fo = FileUtil.toFileObject(hgIgnore); + File gitIgnore = new File(directory, FILENAME_GITIGNORE); + FileObject fo = FileUtil.toFileObject(gitIgnore); if (entries.size() == 0) { if (fo != null) fo.delete(); @@ -564,7 +563,7 @@ public class GitUtils { if (fo == null || !fo.isValid()) { fo = FileUtil.toFileObject(directory); - fo = fo.createData(FILENAME_HGIGNORE); + fo = fo.createData(FILENAME_GITIGNORE); } FileLock lock = fo.lock(); PrintWriter w = null; @@ -581,10 +580,10 @@ public class GitUtils { } /** - * addIgnored - Add the specified files to the .hgignore file in the + * addIgnored - Add the specified files to the .gitignore file in the * specified repository. * - * @param directory for repository for .hgignore file + * @param directory for repository for .gitignore file * @param files an array of Files to be added */ public static void addIgnored(File directory, File[] files) throws IOException { @@ -601,10 +600,10 @@ public class GitUtils { } /** - * removeIgnored - Remove the specified files from the .hgignore file in + * removeIgnored - Remove the specified files from the .gitignore file in * the specified repository. * - * @param directory for repository for .hgignore file + * @param directory for repository for .gitignore file * @param files an array of Files to be removed */ public static void removeIgnored(File directory, File[] files) throws IOException { @@ -626,7 +625,7 @@ public class GitUtils { * @param Map of <File, FileInformation> interestingFiles to be processed and divided up into Files in Directory * @param Collection of <File> files to be processed against the interestingFiles * @return Map of Dirs containing Map of files and status for all files in each directory - * @throws org.netbeans.modules.mercurial.HgException + * @throws org.netbeans.modules.git.GitException; */ public static Map<File, Map<File, FileInformation>> getInterestingDirs(Map<File, FileInformation> interestingFiles, Collection<File> files) { Map<File, Map<File, FileInformation>> interestingDirs = new HashMap<File, Map<File, FileInformation>>(); @@ -685,18 +684,17 @@ public class GitUtils { /** * Semantics is similar to {@link org.openide.windows.TopComponent#getActiva -tedNodes()} except that this + tedNodes()} except that this * method returns File objects instead of Nodes. Every node is examined for -Files it represents. File and Folder + Files it represents. File and Folder * nodes represent their underlying files or folders. Project nodes are repr -esented by their source groups. Other + esented by their source groups. Other * logical nodes must provide FileObjects in their Lookup. * * @return File [] array of activated files * @param nodes or null (then taken from windowsystem, it may be wrong on ed -itor tabs #66700). + itor tabs #66700). */ - public static VCSContext getCurrentContext(Node[] nodes) { if (nodes == null) { nodes = TopComponent.getRegistry().getActivatedNodes(); @@ -723,11 +721,11 @@ itor tabs #66700). */ public static File getRootFile(VCSContext context){ if (context == null) return null; - Git hg = Git.getInstance(); + Git git = Git.getInstance(); File [] files = context.getRootFiles().toArray(new File[context.getRootFiles().size()]); if (files == null || files.length == 0) return null; - File root = hg.getTopmostManagedParent(files[0]); + File root = git.getTopmostManagedParent(files[0]); return root; } @@ -753,7 +751,7 @@ itor tabs #66700). if (p != null) { return p; } else { - Git.LOG.log(Level.FINE, "HgUtils.getProjectFile(): No project for {0}", // NOI18N + Git.LOG.log(Level.FINE, "GitUtils.getProjectFile(): No project for {0}", // NOI18N file); } } @@ -783,15 +781,14 @@ itor tabs #66700). } /** - * Checks file location to see if it is part of mercurial metdata + * Checks file location to see if it is part of Git metdata * * @param file file to check - * @return true if the file or folder is a part of mercurial metadata, false otherwise + * @return true if the file or folder is a part of Git metadata, false otherwise */ - public static boolean isPartOfMercurialMetadata(File file) { + public static boolean isPartOfGitMetadata(File file) { return metadataPattern.matcher(file.getAbsolutePath()).matches(); } - /** * Forces refresh of Status for the given directory @@ -888,8 +885,8 @@ itor tabs #66700). return NbBundle.getMessage(SyncFileNode.class, "LBL_Location_NotInRepository"); // NOI18N } - Git mercurial = Git.getInstance(); - File rootManagedFolder = mercurial.getTopmostManagedParent(file); + Git git = Git.getInstance(); + File rootManagedFolder = git.getTopmostManagedParent(file); if ( rootManagedFolder == null){ return NbBundle.getMessage(SyncFileNode.class, "LBL_Location_NotInRepository"); // NOI18N } @@ -903,7 +900,7 @@ itor tabs #66700). } /** - * Normalize flat files, Mercurial treats folder as normal file + * Normalize flat files, Git treats folder as normal file * so it's necessary explicitly list direct descendants to * get classical flat behaviour. * src/org/netbeans/modules/git/util/GitUtils.java 1d64aab461050116f2de608c8f68bdda4d161c33 Alex Coles alexbcoles@mac.com http://github.com/myabc/nbgit/commit/8ddb7c661301ad2a901683491fac29835b8f54eb 8ddb7c661301ad2a901683491fac29835b8f54eb 2008-03-23T09:39:46-07:00 2008-03-23T09:39:46-07:00 Renamed constants, local variables and member variables using "hg" to "git". Renamed Resource Bundle string keys using "hg" to "git". Renamed references to hgk to gitk. Updated multiple constant and method string values. Updated several methods referring to Mercurial. Updated JavaDocs making references to Mercurial. Housekeeping: Added @Override annotation for many methods. 6285cb747f948aeac578a3693edcf30ab576cb46 Alex Coles alexbcoles@mac.com