repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Converted to unix newlines
2007-05-15
S
i
mon Hausm
a
n
n
Converted to uni
x
newli
n
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on H
a
us
m
ann
Make
s
u
bmitting wo
r
k on
W
i
n
d
ows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Haus
m
ann
Make sure all
popen calls u
s
e
binary mode (fo
r
Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a litt
l
e
.
ba
t
wrapper from Ma
r
ius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
smann
Us
e
the subprocess
m
o
d
u
le
i
nstead
o
f
p
o
p
en2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
mon Hau
s
man
n
Document some implementation details, for
the
c
urio
u
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Cleanup, removed the old ta
g
gin
g
co
d
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
s
m
a
n
n
cleanup, re
n
am
e
d se
l
f
.
globalPrefix to self
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
M
i
c
r
o
clean
u
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
m
on Hausmann
Doc cle
a
nups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
Handle patch error
s
in git-p4
submit be
t
ter
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new attempt at
fi
x
ing
the
c
hild-fast-impo
r
t-
p
rocess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
imon
H
ausmann
Slightly improved formatt
i
n
g of the raw_input
que
s
tions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Haus
m
ann
Removed the old patch
a
pply code
from g
i
t-p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausm
a
nn
Fi
x
the timezo
n
e formatting
.
Now qgit also displ
a
y
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
S
imon
Hausmann
Prin
t
an error mes
s
age of some sort if gi
t
fast
-
imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simo
n
Hausm
a
n
n
Allow
f
or convenient rebas
i
ng after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
Add
e
d a simple example of usage
to the "
d
ocument
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausm
a
nn
fix var
i
a
b
le us
a
g
e
(oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
im
o
n H
a
u
s
mann
Fix file
d
etermination for
#he
a
d
imports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
A
dded git-p4 clone convenience com
m
and
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
Honor --s
i
lent for label
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Haus
m
ann
Turn off potentially slow
label detect
i
on by def
a
ult
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hausman
n
Provide a tree su
m
m
a
ry after git-p4 re
b
a
s
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imon H
a
u
smann
Adde
d
git-p4 rebase con
v
enien
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
imon Hausmann
Cl
e
an
u
p
p
ython c
l
ass n
a
mes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
imon Ha
u
smann
Fix "comp
i
l
ation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Si
m
on Ha
u
smann
Fix the docs for
g
it-p4 su
b
mit and turn git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hausmann
Fix variable usa
g
e in
t
ag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon H
a
usmann
Added sup
p
ort for mapping p4 lab
e
ls to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon
H
ausma
n
n
git-p4
debug doesn't need
a
g
it r
e
posit
o
ry
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
D
o
n
't try
t
o parse any options with git-p
4
debug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n
Hausman
n
Prefer git c
o
mmand ove
r
git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
ausma
n
n
M
inor
c
os
m
etic fixlet f
o
r the gi
t
-p4
s
ub
m
it sync questi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
Hausmann
D
iffer
e
nt versio
n
s
o
f p
4
have
d
iffere
n
t output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the new incremental import style
by defa
u
lt
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on
Hausma
n
n
Make it po
s
sible to run g
i
t
-
p4 sub
m
it from wi
t
hin
t
he
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Brand new smart increm
e
ntal impo
r
t
th
a
t doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
m
on Ha
u
sma
n
n
Set t
h
e
d
efault branch in run, not in the
constru
c
tor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hausmann
H
elper function to check
the ex
i
stance of
a rev
i
sion
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
u
smann
Adde
d
s
ome help
e
r
fu
n
c
t
ion(s) t
o
parse
t
he depot p
a
th
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausman
n
Chang
e
d th
e
defa
u
lt
b
ranch f
o
r imports
from "mas
t
er
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n
Ha
u
smann
C
hang
e
d the
form
a
t of the imported log messa
g
e slig
h
tly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Removed the
.
py e
x
t
ensio
n
fr
o
m git-p4 as it's
annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
o
n
Hausmann
D
o
n
'
t show t
h
e s
u
bmi
t
template and the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
mann
Make it po
s
s
i
ble to
i
nvo
k
e git-p4 from w
i
thin subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Ha
u
smann
Made --apply-as-patch
t
he default for
git-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Fix
s
upport
f
o
r
deletions
in git-p4 s
u
bmit when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
A
dded
e
x
perimen
t
a
l
but
s
uper-fast --ap
p
ly-
a
s-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Documentation enhance
m
ents
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
Start
o
f
the git-
p
4 documentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Re
m
oved p4-fast-export and p4-git-sync as they've be
e
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Sim
o
n Hausmann
Fixed the ini
t
ial version
i
m
port by g
e
tt
i
n
g
t
h
e file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
a
usmann
Added mis
s
ing "
s
elf"s to make the script
evaluat
e
c
o
r
rectl
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
ma
n
n
Completely untested "me
r
g
e
" of p4
-
f
ast-
e
xport
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon H
a
u
smann
sync
-
to-perforce
i
s now called submit and fixed th
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Haus
m
ann
Part of t
h
e co
d
e i
s
copyright
b
y Trolltech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
imon
H
a
usmann
Fir
s
t (unte
s
ted)
a
tte
m
p
t
at migrating p4-git-sync i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Prov
i
de a little bit
o
f
hel
p
description for the
gi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Ha
u
sm
a
nn
S
t
art mov
i
ng the git-p4 tools into one
single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
o
n Hau
s
mann
P
ass t
h
e
r
ight
n
um
b
er of argument
s
to com
m
it, fixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved the git dir detec
t
ion
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Default to
i
n
t
e
rac
t
ive
syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon H
a
usman
n
Use p
4
revert
.
.
.
instead of revert
-
a
.
.
.
after submit
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon
Hausmann
Auto-d
e
tect
the cu
r
rent git
b
ranch before
s
u
b
mittin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ignore A
p
ple re
s
o
urce files when imp
o
rting from p
e
rforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n
Hausmann
Be nice a
n
d
u
se /usr/bin/en
v
p
y
thon for the git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
A
u
to
m
ati
c
ally o
p
erate on a temporary bra
n
ch,
n
eeded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon
H
ausmann
Lots of bugfixes to p4-g
i
t-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on
Hausmann
Fi
x
git-dir option and allow read
i
ng log substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simo
n
H
a
usmann
First ver
s
ion of a
n
e
w
script
t
o s
u
bmit
chan
g
e
s ba
c
k
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
S
p
lit up
t
he cache commandline optio
n
s into
(command
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Reduce the num
b
er of false "merges" by sk
i
pping "
b
ran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hausm
a
nn
More work on b
r
anch detection by implementi
n
g
c
h
a
ngeIsB
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More code clea
n
u
ps and pr
e
p
arat
i
ons fo
r
more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor code cleanu
p
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
M
ake the
p
4
d
ata/co
m
mand
c
ac
h
e configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
aus
m
ann
Fixed p4-debug file extension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon H
a
us
m
ann
Change
d
-
-kno
w
n-bran
c
h
e
s to
t
ake
a file as
a
r
gument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Haus
m
ann
Work i
n
progres
s
on detecting bra
n
ches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust the
o
utput p
a
r
sing
o
f git name
-
r
ev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
D
on't print a plain newline at t
h
e
end of t
h
e
e
xecution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Haus
m
ann
More
w
o
rk in --silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausma
n
n
Adde
d
s
u
p
port fo
r
--sil
e
nt so that
p4-
f
a
st-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simo
n
Hausmann
Added p4 del
e
te behavioural emulati
o
n as todo it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Hau
s
m
a
nn
Fix single-branch i
m
po
r
t
s by
skip
p
ing the branch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon Hausmann
Use
s
ets
.
Set()
i
nstead of set() to ru
n
also wit
h
older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
i
m
on Hausmann
Make it possible to
sp
e
cify the p4
ch
a
n
ges to
imp
o
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
S
i
mo
n
Hausma
n
n
When trying to map
p4 in
t
egrations to gi
t
merges jus
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausm
a
nn
Set git fast-
i
mport mar
k
s
f
o
r every
i
m
po
r
ted chan
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
After marki
n
g
a p4
b
ranch as mer
g
ed don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
More fixes i
n
heur
i
s
t
i
c p4 branch dete
c
tion based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Started
w
ork on p
4
b
ranch
d
e
t
ection (
e
xperime
n
tal!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
o
n
Hausmann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Hausmann
Clean
u
p
s, remove unused variable
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hau
s
mann
Cr
e
ate light
w
eight gi
t
tags (usin
g
the "reset
"
trick
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Haus
m
ann
Added a litt
l
e
he
l
p
e
r
script to
r
emove unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-10
S
i
m
on Hausma
n
n
C
h
ange
d
t
he default git import br
a
nc
h
f
rom "
p
4" to
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simo
n
Hausmann
Av
o
id the excessive use of git tags f
o
r ever
y
p
erf
o
rce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor
code clean
u
ps
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next