Sync

- Touchup dialogs a bit
- Icons for diff/history windows, util func for it
- Fix context management issues with VC++6, remove refcount
- Implement GetCommandOptions, used only for push after commit rn
- Enable push after commit
- Enable init from SccOpenProject
- Fix crash from HTTP auth dialog

Author: NattyNarwhal

LGit.aps

@@ -100,14 +100,14 @@ SCCRTN SccInitialize (LPVOID * context,				// SCC provider contex
 					  LPLONG checkoutCommentLen,	// Check out comment max length
 					  LPLONG commentLen)			// Other comments max length
 {
-	int init_count;
-
-	init_count = git_libgit2_init();
+	LGitLog("**SccInitialize**\n");
+	LGitLog("  Caller = %s\n", callerName);
+	int init_count = git_libgit2_init();
 	if (init_count < 0) {
 		LGitLibraryError(hWnd, "Error initializing LGit");
 		return SCC_E_INITIALIZEFAILED;
 	}
-	LGitLog("**SccInitialize** initialization count: %d (by %s)\n", init_count, callerName);
+	LGitLog("  InitCount = %d\n", init_count);
 
 	/* Should this be only on the first init count? */
 	LGitInitOpts();
@@ -125,8 +125,11 @@ SCCRTN SccInitialize (LPVOID * context,				// SCC provider contex
 
 	LGitLog("  LPVOID* Context=%p\n", context);
 	LGitLog("         *Context=%p\n", *context);
-	// It appears VS reuses
-	if (context && *context == NULL) {
+	/*
+	 * VC++ 6 will provide the last handle we initialized. Other IDEs don't do
+	 * this. It's not some reuse scheme - don't get confused!
+	 */
+	if (context != NULL) {
 		*context = malloc(sizeof(LGitContext));
 		LGitContext *ctx = (LGitContext*)*context;
 		if (*context == NULL) {
@@ -136,14 +139,8 @@ SCCRTN SccInitialize (LPVOID * context,				// SCC provider contex
 		ZeroMemory(*context, sizeof(LGitContext));
 		strlcpy(ctx->appName, callerName, SCC_NAME_LEN);
 		ctx->dllInst = dllInstance;
-		ctx->refcount = 1;
-	} else if (context) {
-		LGitContext *ctx = (LGitContext*)*context;
-		LGitLog("     Recycling context\n");
-		LGitLog("     ProjPath =%s\n", ctx->path);
-		LGitLog("     WorkPath =%s\n", ctx->workdir_path);
-		LGitLog("(Old)Refcount =%d\n", ctx->refcount);
-		LGitLog("(New)Refcount =%d\n", ++ctx->refcount);
+	} else {
+		return SCC_E_INITIALIZEFAILED;
 	}
 
 	return SCC_OK;
@@ -160,20 +157,9 @@ SCCRTN SccUninitialize (LPVOID context)
 	if (uninit_count < 0) {
 		LGitLibraryError(NULL, "Error ending LGit");
 	}
-	/*
-	 * HACK: It seems Visual C++ 6, when switching workspaces, will call
-	 * close, uninit... then open project, which frees this. Then it keeps
-	 * the handle. Then devenv98 will keep multiple contexts around, so we
-	 * should keep a reference count instead.
-	 */
-	if (context) {
-		ctx->refcount--;
-		LGitLog("  Refcount now %d\n", ctx->refcount);
-	}
-	if (context && ctx->refcount == 0) {
-		LGitLog("  Freed context\n");
-		free(context);
-	}
+
+	LGitLog("  Freed context\n");
+	free(context);
 	return SCC_OK;
 }
 
@@ -192,16 +178,6 @@ SCCRTN SccRunScc(LPVOID context,
 	return SCC_E_OPNOTSUPPORTED;
 }
 
-SCCRTN SccGetCommandOptions (LPVOID context, 
-							 HWND hWnd, 
-							 enum SCCCOMMAND nCommand,
-							 LPCMDOPTS * ppvOptions)
-{
-	LGitLog("**SccGetCommandOptions** Context=%p\n", context);
-	LGitLog("  command %s\n", LGitCommandName(nCommand));
-	return SCC_E_OPNOTSUPPORTED;
-}
-
 const char* LGitCommandName(enum SCCCOMMAND command)
 {
 	switch (command) {

LGit.cpp

@@ -14,10 +14,14 @@
 /* XXX: Use a case-insensitive comparator */
 typedef std::set<std::string> CheckoutQueue;
 
+/* Defining here so they can be defined in ctx; used in cmdopts.cpp */
+typedef struct _LGitCommitOpts {
+	BOOL push;
+} LGitCommitOpts;
+
 typedef struct _LGitContext {
 	/* housekeeping */
 	BOOL active;
-	int refcount;
 	HINSTANCE dllInst;
 	/* With shared SCC subproject, so we don't free IDE provided dir string */
 	BOOL addSccSuccess;
@@ -37,6 +41,8 @@ typedef struct _LGitContext {
 	char appName[SCC_NAME_SIZE];
 	/* SCC provided username, used for some remote contexts */
 	char username[SCC_USER_SIZE];
+	/* Command options */
+	LGitCommitOpts commitOpts;
 } LGitContext;
 
 /* LGit.cpp */
@@ -64,6 +70,10 @@ void LGitPushCheckout(LGitContext *ctx, const char *fileName);
 BOOL LGitPopCheckout(LGitContext *ctx, const char *fileName);
 BOOL LGitIsCheckout(LGitContext *ctx, const char *fileName);
 
+/* pushpull.cpp */
+SCCRTN LGitPush(LGitContext *ctx, HWND hwnd, git_remote *remote, git_reference *refname);
+SCCRTN LGitPushDialog(LGitContext *ctx, HWND hwnd);
+
 /* clone.cpp */
 SCCRTN LGitClone(LGitContext *ctx, HWND hWnd, LPSTR lpProjName, LPSTR lpLocalPath, LPBOOL pbNew);
 
@@ -109,3 +119,6 @@ BOOL LGitCertificatePrompt(LGitContext *ctx, HWND parent, git_cert *cert, const
 char *strcasestr(const char *s, const char *find);
 size_t strlcat(char *dst, const char *src, size_t siz);
 size_t strlcpy(char *dst, const char *src, size_t siz);
+
+/* winutil.cpp */
+void LGitSetWindowIcon(HWND hwnd, HINSTANCE inst, LPCSTR name);

LGit.dsp

@@ -110,6 +110,7 @@ END
 IDD_DIFF DIALOG DISCARDABLE  0, 0, 402, 245
 STYLE WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Diff"
+MENU IDR_DIFF_MENU
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "List1",IDC_DIFFTEXT,"SysListView32",LVS_REPORT | 
@@ -169,7 +170,7 @@ BEGIN
 END
 
 IDD_CLONE DIALOG DISCARDABLE  0, 0, 254, 99
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Clone Git Repository"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -187,7 +188,7 @@ BEGIN
 END
 
 IDD_AUTH_USERPASS DIALOG DISCARDABLE  0, 0, 254, 81
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Authenticate for Repository"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -215,7 +216,7 @@ BEGIN
 END
 
 IDD_NEW_SIGNATURE DIALOG DISCARDABLE  0, 0, 254, 81
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Enter Signature"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -249,6 +250,34 @@ BEGIN
                     WS_VSCROLL | WS_HSCROLL
 END
 
+IDD_OPTIONS_COMMIT DIALOG DISCARDABLE  0, 0, 162, 74
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Commit Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,50,53,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,105,53,50,14
+    CONTROL         "&Push after commit",IDC_OPTIONS_COMMIT_PUSH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
+    LTEXT           "When this option is checked, you will get a prompt after commit to push your changes to an available remote.",
+                    IDC_STATIC,7,22,148,26
+END
+
+IDD_PUSH_UPSTAIRS DIALOG DISCARDABLE  0, 0, 254, 81
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Push"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,141,60,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,197,60,50,14
+    CTEXT           "&Remote",IDC_STATIC,7,7,40,14,SS_CENTERIMAGE
+    CTEXT           "Re&ference",IDC_STATIC,7,26,40,14,SS_CENTERIMAGE
+    COMBOBOX        IDC_PUSH_REMOTE,47,7,200,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PUSH_REF,47,26,200,56,CBS_DROPDOWN | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -383,6 +412,33 @@ BEGIN
         HORZGUIDE, 156
         HORZGUIDE, 161
     END
+
+    IDD_OPTIONS_COMMIT, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 155
+        VERTGUIDE, 100
+        VERTGUIDE, 105
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 67
+        HORZGUIDE, 17
+        HORZGUIDE, 22
+        HORZGUIDE, 48
+        HORZGUIDE, 53
+    END
+
+    IDD_PUSH_UPSTAIRS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 247
+        VERTGUIDE, 47
+        VERTGUIDE, 191
+        VERTGUIDE, 197
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 74
+        HORZGUIDE, 54
+        HORZGUIDE, 60
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -401,6 +457,8 @@ IDI_DIFF_HUNK           ICON    DISCARDABLE     "diffhunk.ico"
 IDI_DIFF_ADD            ICON    DISCARDABLE     "diffadd.ico"
 IDI_DIFF_DEL            ICON    DISCARDABLE     "diffdel.ico"
 IDI_DIFF_FILE_B         ICON    DISCARDABLE     "difffilb.ico"
+IDI_HISTORY             ICON    DISCARDABLE     "history.ico"
+IDI_DIFF                ICON    DISCARDABLE     "diff.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

LGit.h

@@ -8,7 +8,7 @@
 LONG LGitGetCaps(void)
 {
 	/* XXX: We could do IDE-specific hacks eventually. */
-	return /* all as of 1.3 listed */
+	LONG caps = /* all as of 1.3 listed */
 		/* SccRemove */
 		SCC_CAP_REMOVE
 		/* SccRename */
@@ -21,9 +21,10 @@ LONG LGitGetCaps(void)
 		| SCC_CAP_PROPERTIES
 		/* SccRunScc */
 		| SCC_CAP_RUNSCC
-		/* SccGetCommandOptions; Not supported yet, will eventually */
-		/* | SCC_GETCOMMANDOPTIONS */
-		| SCC_CAP_QUERYINFO /* SccQueryInfo */
+		/* SccGetCommandOptions */
+		| SCC_CAP_GETCOMMANDOPTIONS
+		/* SccQueryInfo */
+		| SCC_CAP_QUERYINFO
 		/* SccGetEvents; Not support, may not make sense */
 		/* | SCC_CAP_GETEVENTS */
 		/* SccGetProjPath */
@@ -72,6 +73,8 @@ LONG LGitGetCaps(void)
 		| SCC_CAP_REENTRANT
 		/* Creates MSSCCPRJ.SCC; we don't right now (but supports func) */
 		| SCC_CAP_SCCFILE;
+	LGitLog(" ! Caps %x\n", caps);
+	return caps;
 }
 
 SCCEXTERNC SCCRTN EXTFUN __cdecl SccGetExtendedCapabilities (LPVOID pContext,