repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Create the origin based import branch using git update-ref instead of git branch
2007-05-17
Simon
H
ausmann
Create the origi
n
bas
e
d import branch u
s
ing git
u
pd
a
te
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon H
a
usmann
Removed anci
e
n
t
and
u
nused code to find the
last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Removed
c
leantags command
.
It doesn't have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
au
s
man
n
Clean up co
d
e du
p
licati
o
n for revision
p
arsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Hau
s
mann
Always pa
s
s a sha
1
for
t
h
e init
i
al
p
arent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Fixing s
y
ncing (gitdir discovery / cd) for
b
are repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausma
n
n
A littl
e
tod
o
note bef
o
re I
forget it :), based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Si
m
on H
a
us
m
a
n
n
Fix calli
n
g git-p4 rebase f
r
om
withi
n
a subdir
e
c
tory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Haus
m
ann
G
ive a better hint if gi
t
-p4 su
b
mit fai
l
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
A
d
ded
t
he possi
b
il
i
t
y of skipping patches
d
uring git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausm
a
nn
Make git-p4 wor
k
with b
a
re repo
s
itories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Fix git-p4 clone
/
/
depot/p
r
oje
c
t (head im
p
ort)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Marius Storm-Olsen
Make the command
c
a
ll sil
e
n
t
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on H
a
u
s
mann
Converted to unix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausmann
Make submitting wor
k
on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
M
a
ke sure all popen call
s
u
se binary mode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on H
a
usma
n
n
Add
e
d
a
l
ittle
.
bat
wr
a
p
p
er from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
mann
Use
t
he s
u
bproce
s
s
m
odule instead of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
D
o
cument some impl
e
m
e
n
tation details, for t
h
e curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
C
l
ea
n
up, re
m
o
ved t
h
e old tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simo
n
Hausman
n
c
leanup,
r
ena
m
ed self
.
globalPre
f
ix to self
.
depo
t
Path
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Hausmann
Mi
c
ro cleanu
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausman
n
D
oc
c
le
a
nups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon H
a
usmann
Handle
p
atch erro
r
s in
g
it-p4
submit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
S
i
mon Ha
u
smann
A new attempt at fixing the
c
h
ild-f
a
st-import-p
r
oc
e
ss
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Slig
h
tly
i
m
p
r
o
ved formatt
i
ng
of the raw_inp
u
t questio
n
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Remo
v
ed
t
h
e old patch apply code from git-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
Ha
u
smann
F
i
x the t
i
mez
o
ne formatting
.
Now qgit also di
s
plays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print a
n
error m
e
ssage of
s
o
m
e so
r
t if
g
it fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
All
o
w for c
o
n
venient rebasing after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
o
n Hausm
a
nn
Added
a si
m
ple example of usage to the "do
c
ume
n
tation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Haus
m
ann
fix variable usage (
o
op
s
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Fix file deter
m
ination for #head impo
r
ts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausma
n
n
Adde
d
git-p4 clon
e
convenien
c
e
co
m
mand
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausma
n
n
Honor
-
-silent
f
or
l
abels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Turn off
p
otentially
s
low label detec
t
ion b
y
default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausmann
Provid
e
a tree summary after git-p4 r
e
base
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simo
n
Ha
u
s
m
a
nn
Added git-p4 rebase
convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Cl
e
an
u
p
p
y
t
hon clas
s
n
ames
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simo
n
Ha
u
s
mann
Fi
x
"
com
p
i
lation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon
Ha
u
smann
F
i
x the docs
f
or
git-p4
submit and
turn gi
t
-
p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausman
n
Fix varia
b
le usage in tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simo
n
Hausmann
Add
e
d sup
p
ort for mapping p
4
labels to gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
Ha
u
smann
git-p4 debug
doe
s
n't
n
eed a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't try to
p
ar
s
e
any options with
gi
t
-p4
d
ebug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Prefer
g
it command over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausman
n
Minor
cosmetic fixlet
for the git-p4 submit sync
q
uestio
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
ausmann
Different versions
o
f p4 have dif
f
erent output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausm
a
nn
Use the new incrementa
l
import style
b
y default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon
Hausmann
Make it
possible to
run g
i
t-p4 submi
t
from within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Haus
m
ann
Brand n
e
w smart increm
e
ntal import that doesn
'
t ne
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
sm
a
nn
Set the default branch
i
n run, not
i
n
t
h
e
constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Helper function to ch
e
ck the existance of
a revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausman
n
Adde
d
some helper function(s)
to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Cha
n
ged
t
he de
f
a
u
lt br
a
n
c
h
f
o
r impor
t
s from "master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
nged the format of the imp
o
rted log
message slig
h
tly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imo
n
Hausman
n
R
e
moved
t
he
.
py
e
xt
e
nsion from
g
it-p4 as
it's a
n
noying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Do
n
't show the
s
u
bmit
template and the di
f
f f
i
rst in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Haus
m
ann
Make it poss
i
ble
t
o invoke
g
it-p4 from within subdi
r
ectori
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Made --apply-as-
p
a
t
c
h the de
f
ault for git-
p
4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausm
a
n
n
F
ix support for
d
eletions i
n
git-p
4
submit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Adde
d
exp
e
rimental but s
u
per-fast --ap
p
ly-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Documentation
enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausma
n
n
Star
t
of the git-p4 d
o
cumentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
Remov
e
d p4-f
a
st-export an
d
p
4
-git-syn
c
as t
h
ey'v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Fixed the
i
nit
i
al version import by getting the fi
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
A
dded
missing "se
l
f
"
s
t
o make t
h
e
script ev
a
luate co
r
rectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hausmann
C
o
mpletely
untested "merge" of p4-fast-export
.
py
into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
sync-to-
p
erforce is now
c
alled submit and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Par
t
of the code
is
copyright by Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on Hausmann
First
(
unteste
d
) attempt at mig
r
atin
g
p4-
g
it-sy
n
c into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
Provide
a litt
l
e bit o
f
help description for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start movi
n
g the git-p4 too
l
s
i
nto one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
Pass
t
he right number of arguments to co
m
mit, fixe
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Impr
o
ve
d
the git d
i
r
detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
S
imo
n
Hausmann
D
e
f
ault to interac
t
ive synci
n
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use p4 revert
.
.
.
instead of re
v
ert -a
.
.
.
after
submit
t
i
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Hausma
n
n
Auto
-
detect the curr
e
nt g
i
t b
r
an
c
h
bef
o
re submitt
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
H
a
u
smann
Ign
o
re
A
pple
resource files when
impo
r
ting from p
e
rforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Be nice
and use
/
us
r
/bi
n
/env python
for the
git-p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hau
s
mann
Automatically op
e
rate on a
tempor
a
ry branch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausma
n
n
Lots of bug
f
ix
e
s t
o
p4-g
i
t-sy
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
imo
n
H
a
u
s
mann
Fix
git
-
d
i
r
option
a
nd allow r
e
ading
l
og substit
u
tions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon
Hausmann
First version of a new script to su
b
mit
c
hanges back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
S
p
lit up the cache command
l
ine opti
o
n
s
int
o
(
command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Reduce the num
b
er
o
f
f
alse "merg
e
s" by
ski
p
ping "br
a
nch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work on
b
ran
c
h detect
i
on by implementing
c
hangeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
m
on Hausmann
More
co
d
e clea
n
ups
a
nd preparations
f
or more
b
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
Minor code cl
e
anups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
o
n Hausmann
Make
the p4 data/command cache configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausma
n
n
Fixed p
4
-debug file extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --known-br
a
nches to take a
f
ile
a
s
argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work in progress on detect
i
ng branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon Hausmann
Adjust th
e
output
par
s
ing of git name-
r
ev t
o
handl
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Si
m
on Hausma
n
n
Don't prin
t
a p
l
a
i
n newline at the end of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simo
n
H
a
usmann
More work in --silent s
u
pp
o
r
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
A
dded support for
--silent
so tha
t
p4-fast-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simo
n
Hausmann
Added p4 delete be
h
aviou
r
al emu
l
ation
as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon
Hausmann
F
i
x single-branch
i
m
port
s
by skipp
i
n
g
the branch/me
r
ge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausma
n
n
Use sets
.
Set
(
) i
n
s
t
ead
of set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next